]> git.xonotic.org Git - xonotic/xonotic.git/commit
Merge branch 'master' of /var/cache/git/xonotic/xonotic
authorRudolf Polzer <divverent@alientrap.org>
Thu, 26 Jan 2012 14:52:44 +0000 (15:52 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Thu, 26 Jan 2012 14:52:44 +0000 (15:52 +0100)
commitc38aad81dd7d68fc5e6d00a7986ad55e1aad06b3
tree9bfb63cc4b21b5e4065f6ac9fa0c6fdce5c88545
parentd4d775b6051fbc6a6af9cb9afbf1c98880b2d3a1
parent9112a866f743bbeeaeaa4c3bf8c8d64d0d887752
Merge branch 'master' of /var/cache/git/xonotic/xonotic