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/common/data_common
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
..
chat Move code to root 5 years ago
r2 Remove redundant caster parts from palette 4 years ago
.editorconfig Add editor config 4 years ago
database.xml Sync network xml with Forge data repo, rev ba4724f848d80775acdd7e3190f6e3eb8af47834 4 years ago
msg.xml Move item rename to be an admin command, not for player use 4 years ago
system_files.cfg Move code to root 5 years ago