khanat-opennel-code/code/ryzom/server
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_shard Revert "mise a jour de RC" 2017-03-15 20:43:10 +01:00
patchman_cfg Revert "mise a jour de RC" 2017-03-15 20:43:10 +01:00
save_shard 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
admin_executor_service.cfg Changed: replace c++11 code 2017-03-15 17:43:49 +02:00
admin_executor_service_default.cfg Revert "mise a jour de RC" 2017-03-15 20:43:10 +01:00
admin_service.cfg Changed: replace c++11 code 2017-03-15 17:43:49 +02:00
admin_service_default.cfg Revert "mise a jour de RC" 2017-03-15 20:43:10 +01:00
ai_service.cfg Revert "mise a jour de RC" 2017-03-15 20:43:10 +01:00
ai_service_default.cfg Revert "mise a jour de RC" 2017-03-15 20:43:10 +01:00
backup_service.cfg Revert "mise a jour de RC" 2017-03-15 20:43:10 +01:00
backup_service_default.cfg Revert "mise a jour de RC" 2017-03-15 20:43:10 +01:00
backup_service_interface.cfg 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
common.cfg Revert "mise a jour de RC" 2017-03-15 20:43:10 +01:00
dynamic_scenario_service.cfg Revert "mise a jour de RC" 2017-03-15 20:43:10 +01:00
dynamic_scenario_service_default.cfg Revert "mise a jour de RC" 2017-03-15 20:43:10 +01:00
entities_game_service.cfg Merge branch 'ryzomcore' into feature/merge_ryzomcore170417 2017-03-20 17:43:51 +01:00
entities_game_service_default.cfg Revert "mise a jour de RC" 2017-03-15 20:43:10 +01:00
frontend_service.cfg Changed: replace c++11 code 2017-03-15 17:43:49 +02:00
frontend_service_default.cfg Revert "mise a jour de RC" 2017-03-15 20:43:10 +01:00
gpm_service.cfg Changed: replace c++11 code 2017-03-15 17:43:49 +02:00
gpm_service_default.cfg Revert "mise a jour de RC" 2017-03-15 20:43:10 +01:00
input_output_service.cfg Revert "mise a jour de RC" 2017-03-15 20:43:10 +01:00
input_output_service_default.cfg Revert "mise a jour de RC" 2017-03-15 20:43:10 +01:00
logger_service.cfg Merge branch 'ryzomcore' into feature/merge_ryzomcore171003 2017-10-14 19:23:02 +02:00
logger_service_default.cfg Revert "mise a jour de RC" 2017-03-15 20:43:10 +01:00
mail_forum_service.cfg Changed: replace c++11 code 2017-03-15 17:43:49 +02:00
mail_forum_service_default.cfg Revert "mise a jour de RC" 2017-03-15 20:43:10 +01:00
mirror_service.cfg Changed: replace c++11 code 2017-03-15 17:43:49 +02:00
mirror_service_default.cfg Revert "mise a jour de RC" 2017-03-15 20:43:10 +01:00
monitor_service.cfg Revert "mise a jour de RC" 2017-03-15 20:43:10 +01:00
monitor_service_default.cfg Revert "mise a jour de RC" 2017-03-15 20:43:10 +01:00
naming_service.cfg Changed: replace c++11 code 2017-03-15 17:43:49 +02:00
naming_service_default.cfg Revert "mise a jour de RC" 2017-03-15 20:43:10 +01:00
session_browser_server.cfg Merge branch 'ryzomcore' into feature/merge_ryzomcore171003 2017-10-14 19:23:02 +02:00
session_browser_server_default.cfg Revert "mise a jour de RC" 2017-03-15 20:43:10 +01:00
shard.screen.rc Revert "mise a jour de RC" 2017-03-15 20:43:10 +01:00
shard_start.bat Revert "mise a jour de RC" 2017-03-15 20:43:10 +01:00
shard_start_cmake.bat Revert "mise a jour de RC" 2017-03-15 20:43:10 +01:00
shard_stop.bat Revert "mise a jour de RC" 2017-03-15 20:43:10 +01:00
shard_stop_cmake.bat Revert "mise a jour de RC" 2017-03-15 20:43:10 +01:00
shard_unifier_service.cfg Merge branch 'ryzomcore' into feature/merge_ryzomcore171003 2017-10-14 19:23:02 +02:00
shard_unifier_service_default.cfg Revert "mise a jour de RC" 2017-03-15 20:43:10 +01:00
sql.cfg Revert "mise a jour de RC" 2017-03-15 20:43:10 +01:00
tick_service.cfg Changed: replace c++11 code 2017-03-15 17:43:49 +02:00
tick_service_default.cfg Revert "mise a jour de RC" 2017-03-15 20:43:10 +01:00
used_continents.cfg Revert "mise a jour de RC" 2017-03-15 20:43:10 +01:00
welcome_service.cfg Changed: replace c++11 code 2017-03-15 17:43:49 +02:00
welcome_service_default.cfg Revert "mise a jour de RC" 2017-03-15 20:43:10 +01:00