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
..
3d	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
build_gamedata	correction du merge	2017-03-21 21:20:08 +01:00
georges	Revert "mise a jour de RC"	2017-03-15 20:43:10 +01:00
logic	Fixed: Compilation	2017-10-03 14:33:33 +02:00
memory	Revert "mise a jour de RC"	2017-03-15 20:43:10 +01:00
misc	Fixed: Warnings with VC++ 2017	2018-01-03 18:04:00 +01:00
nel_unit_test	Merge branch 'ryzomcore' into feature/merge_ryzomcore171003	2017-10-14 19:23:02 +02:00
pacs	Revert "mise a jour de RC"	2017-03-15 20:43:10 +01:00
sound	Revert "mise a jour de RC"	2017-03-15 20:43:10 +01:00
CMakeLists.txt	Revert "mise a jour de RC"	2017-03-15 20:43:10 +01:00