]> de.git.xonotic.org Git - xonotic/xonotic.git/commitdiff
projects / xonotic / xonotic.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1d0b941 601b4f2)
Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic
authorRudolf Polzer <divverent@alientrap.org>
Sat, 16 Apr 2011 17:05:45 +0000 (19:05 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Sat, 16 Apr 2011 17:05:45 +0000 (19:05 +0200)

Trivial merge