khanat-opennel-code/code/ryzom
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
..
client Merge branch 'ryzomcore' into ryzomcore+develop 2018-03-24 18:18:50 +01:00
common Merge branch 'ryzomcore' into ryzomcore+develop 2018-03-24 18:18:50 +01:00
server Merge branch 'ryzomcore' into ryzomcore+develop 2018-03-24 18:18:50 +01:00
tools 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
COPYING Revert "mise a jour de RC" 2017-03-15 20:43:10 +01:00