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