Merge remote-tracking branch 'ryzomcore/atys' into feature/develop-atys

Browse Source

# Conflicts:
#	code/ryzom/client/src/interface_v3/dbctrl_sheet.cpp

feature/develop-atys

kaetemi 4 years ago

parent 5614028f63 405974c9c0

commit 37a729b5cc

No known key found for this signature in database

GPG Key ID: 9873C4D40BB479BC

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File

Diff Content Not Available