]> git.xonotic.org Git - xonotic/xonotic.git/commit
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)
commitc0b656bb97962ba5514d40f5cdd975763fd84f62
tree826dd0fdb61b468d8f9a7509251700e32cbdecaa
parent1f5d74bfbf3e6e79e72d81fdd3d2dd39caef6398
parentce98682e66519168231fe08669290011a158f24b
Merge branch 'master' of git://nl.git.xonotic.org/xonotic/xonotic