]> git.rm.cloudns.org Git - xonotic/xonotic-maps.pk3dir.git/commitdiff
projects / xonotic / xonotic-maps.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a5aee18 caa6497)
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)

Trivial merge