]> git.xonotic.org Git - xonotic/xonotic.git/commit
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)
commitfd313797e4b3fb8ced8f13ad4a42413b7e47e803
treeebbe1e1b6d23b5f78e604fe7877f2114a86291a0
parenta82fc1ffb87035c094fa9935bdab290e89c39e5b
parentc3d5b5977f57f439476ef4e0037440cf053770dc
Merge branch 'master' of git://nl.git.xonotic.org/xonotic/xonotic