]> git.xonotic.org Git - xonotic/xonotic.git/commit
Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic
authorRudolf Polzer <divverent@xonotic.org>
Thu, 20 Oct 2011 19:49:47 +0000 (21:49 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Thu, 20 Oct 2011 19:49:47 +0000 (21:49 +0200)
commit79765c958b0901988b9ec4990c2eccfb9352c803
tree0248c9e9718bab1a3d884e2134ba6861fef5fc4e
parentdde5d0f354334142d371edda6db2b6b985fb8e21
parent0508f0a0db274f51d2a3e1c8a2018b5fb8e24275
Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic