]> git.rm.cloudns.org Git - xonotic/xonotic.git/commit
Merge branch 'master' of git://nl.git.xonotic.org/xonotic/xonotic
authormerlijn <mhofstra@gmail.com>
Sat, 21 Jul 2012 12:15:52 +0000 (14:15 +0200)
committermerlijn <mhofstra@gmail.com>
Sat, 21 Jul 2012 12:15:52 +0000 (14:15 +0200)
commita82fc1ffb87035c094fa9935bdab290e89c39e5b
tree081cf9c7ef282cad7e0de9f4aa60fc4190b0cf1c
parentc0b656bb97962ba5514d40f5cdd975763fd84f62
parentd8da0fb62885db94ee68c9f2df017d536045976a
Merge branch 'master' of git://nl.git.xonotic.org/xonotic/xonotic