]> git.xonotic.org Git - xonotic/xonotic.git/commitdiff
projects / xonotic / xonotic.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3f75d78 c6450b6)
Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic
authorRudolf Polzer <divverent@alientrap.org>
Tue, 8 Mar 2011 20:56:52 +0000 (21:56 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Tue, 8 Mar 2011 20:56:52 +0000 (21:56 +0100)

Trivial merge