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
..
data_common	Merge branch 'ryzomcore' into feature/merge_ryzomcore171003	2017-10-14 19:23:02 +02:00
data_leveldesign/leveldesign/world_editor_files	Revert "mise a jour de RC"	2017-03-15 20:43:10 +01:00
src	Merge branch 'ryzomcore' into ryzomcore+develop	2018-03-24 18:18:50 +01:00
CMakeLists.txt	Revert "mise a jour de RC"	2017-03-15 20:43:10 +01:00