]> git.rm.cloudns.org Git - xonotic/xonotic.git/commit
Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic
authorRudolf Polzer <divverent@alientrap.org>
Thu, 26 Jan 2012 16:15:49 +0000 (17:15 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Thu, 26 Jan 2012 16:15:49 +0000 (17:15 +0100)
commit74fd61ca4ce1a8c8e4eab3b15921ce32a3f058d3
tree8568a7b3fadbff39cac7552c1c5bffc7ff1e8163
parent4edfb6d78d6b388c12f947e6ebba4c8517e77aaf
parentc38aad81dd7d68fc5e6d00a7986ad55e1aad06b3
Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic