]> git.rm.cloudns.org Git - xonotic/xonotic-maps.pk3dir.git/commit
Merge remote-tracking branch 'origin/savagex/common'
authorRudolf Polzer <divverent@alientrap.org>
Sat, 14 May 2011 12:47:31 +0000 (14:47 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Sat, 14 May 2011 12:47:31 +0000 (14:47 +0200)
commit38b521858183cb7194a081e9d477a302b938bce5
treecdf0e9bd646fd1c2949904aa978ba9dd45b54ba8
parenta5aee1894b6a155442cc594a10970b5703ffa8b1
parentcaa6497573c344d0be87c68fb33d19a3fb7fad66
Merge remote-tracking branch 'origin/savagex/common'