Merge branch 'master' into patch-1
authorJean-Paul Mari <1195657+djipi@users.noreply.github.com>
Thu, 7 Sep 2017 03:37:10 +0000 (23:37 -0400)
committerGitHub <noreply@github.com>
Thu, 7 Sep 2017 03:37:10 +0000 (23:37 -0400)
commit26aed6942ef4a15034c69194626e3af4d72b7cb5
tree25cc390bbd1df73db564fd8c4787400c24c74056
parent915ac4db78aee06922dde2befca2eb35a429e63a
parent2223613dcd784c2d611922499a3546fc3941d264
Merge branch 'master' into patch-1
src/file.cpp