You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
ryzom-core/ryzom/server
kaetemi 5fe1c8b378
Merge branch 'core4' into feature/core4-atys
# Conflicts:
#	ryzom/common/data_common/msg.xml
#	ryzom/server/src/entities_game_service/client_messages.cpp
#	ryzom/server/src/entities_game_service/player_manager/character.cpp
#	ryzom/server/src/entities_game_service/player_manager/character_inventory_manipulation.cpp
3 years ago
..
data_shard Move item rename to be an admin command, not for player use 4 years ago
r2_shard/data_shard/mirror_sheets Remove redundant cfg files 4 years ago
src Merge branch 'core4' into feature/core4-atys 3 years ago
tools Sync with Forge server repo, rev ee7e32c71e8b4988e07eb6c52fec6a3fffe0cfc3 4 years ago
www Added: login htacess and server_open_status 4 years ago
CMakeLists.txt Merge branch 'feature/code-to-root' into ryzomclassic-develop 5 years ago