deed 1c898ea0b2 Merge branch 'ryzomcore' into ryzomcore+develop ... # Conflicts: # .hgtags # .travis.yml # code/CMakeModules/FindMSVC.cmake # code/ryzom/client/src/steam_client.cpp		2018-03-24 18:18:50 +01:00
..
CMakeLists.txt	Merge branch 'ryzomcore' into feature/merge_ryzomcore171003	2017-10-14 19:23:02 +02:00
main.cpp	Fixed: Warnings, throw(NLMISC::EStream) deprecated in C++11 and removed in C++17, and class keyword is useless	2018-02-02 21:04:30 +01:00