Jérémie Dumas e47cf8ae94 Merge remote-tracking branch 'upstream/master' into viewer преди 8 години
..
CMakeLists.txt cac2bc0494 fixed compilation problems преди 8 години
main.cpp e47cf8ae94 Merge remote-tracking branch 'upstream/master' into viewer преди 8 години