]> git.xonotic.org Git - xonotic/xonotic.git/commit
Merge commit 'origin/esteel/renames'
authorRudolf Polzer <rpolzer@grawp.(none)>
Fri, 2 Apr 2010 12:25:03 +0000 (14:25 +0200)
committerRudolf Polzer <rpolzer@grawp.(none)>
Fri, 2 Apr 2010 12:25:03 +0000 (14:25 +0200)
commit5d21c011d874c70159ac70f2e4435c57c16a9c3e
tree61eac56212d97b4d5886154fb09b87c03c924a0e
parent1bc0cc65a12e4acdc5e104d0a3e6094848fb233d
parent2ec7592650fe8ad01d877f7c6887d9f9dda143af
Merge commit 'origin/esteel/renames'

Conflicts:
server/readme.txt