Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic
authorRudolf Polzer <divVerent@xonotic.org>
Thu, 16 Dec 2010 09:29:38 +0000 (10:29 +0100)
committerRudolf Polzer <divVerent@xonotic.org>
Thu, 16 Dec 2010 09:29:38 +0000 (10:29 +0100)
commit91db13f951e136707b596bcfe3132d077e78bef3
treef634a47e9f9e3dfaadd1f8d9415879c58aa51513
parent82a15eeacd41f73b8b1e8d4363aebc96c7ebba18
parent8116d0a77a63d54601ed75b15746b19ce66e467a
Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic