]> git.xonotic.org Git - xonotic/xonotic.git/commitdiff
projects / xonotic / xonotic.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1f5d74b ce98682)
Merge branch 'master' of git://nl.git.xonotic.org/xonotic/xonotic
authormerlijn <mhofstra@gmail.com>
Sat, 23 Jun 2012 12:17:45 +0000 (14:17 +0200)
committermerlijn <mhofstra@gmail.com>
Sat, 23 Jun 2012 12:17:45 +0000 (14:17 +0200)

Trivial merge