]> git.xonotic.org Git - xonotic/xonotic.git/commitdiff
projects / xonotic / xonotic.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: a82fc1f c3d5b59)
Merge branch 'master' of git://nl.git.xonotic.org/xonotic/xonotic
authormerlijn <mhofstra@gmail.com>
Sat, 25 Aug 2012 11:58:46 +0000 (13:58 +0200)
committermerlijn <mhofstra@gmail.com>
Sat, 25 Aug 2012 11:58:46 +0000 (13:58 +0200)

Trivial merge