Jérémie Dumas e47cf8ae94 Merge remote-tracking branch 'upstream/master' into viewer %!s(int64=8) %!d(string=hai) anos
..
CMakeLists.txt cac2bc0494 fixed compilation problems %!s(int64=8) %!d(string=hai) anos
main.cpp e47cf8ae94 Merge remote-tracking branch 'upstream/master' into viewer %!s(int64=8) %!d(string=hai) anos