]> git.xonotic.org Git - xonotic/xonotic.git/commit
Merge branch 'master' of git://nl.git.xonotic.org/xonotic/xonotic
authorRudolf Polzer <divverent@xonotic.org>
Fri, 26 Oct 2012 19:48:31 +0000 (21:48 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Fri, 26 Oct 2012 19:48:31 +0000 (21:48 +0200)
commit2621dbba830ec4ddc6c79d352a2f98666a81f09c
treeeff41a94999f7eead1420622da4110e619deb279
parent9393b811325676b0abf21d24b193fa648331bd37
parentad3995c957915b2b4c4c5febfa2c3c9767adb00f
Merge branch 'master' of git://nl.git.xonotic.org/xonotic/xonotic