Merge branch 'develop' into update_Readme

This commit is contained in:
Florian Küpper authored and GitHub committed 2017-09-01 21:19:47 +02:00
commit 0d0789d091
18 files changed
+64 -14

No files matched your search

+1 -1
View File
@@ -2,7 +2,7 @@
<root>
<PlayerName>Guest 3</PlayerName>
<Difficulty>TR_CONFIG_EASY</Difficulty>
<UserRole>TR_USERROLE_NORMAL</UserRole>
<UserRole>TR_USERROLE_GUEST</UserRole>
<Active>TR_CONFIG_ON</Active>
<Avatar>Avatar_m.png</Avatar>
</root>