]> de.git.xonotic.org Git - xonotic/xonotic.git/commit
Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic
authorRudolf Polzer <divverent@xonotic.org>
Sun, 23 Jun 2013 16:21:23 +0000 (18:21 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Sun, 23 Jun 2013 16:21:23 +0000 (18:21 +0200)
commit100c8c4a3327809ed6c999d0dcbf226545883229
treeb173b23aab2ca400de86a80b8f5718224f30819c
parent92d375abed4fa0c5476323543647130ef47e69ca
parentf12edb616a40570cd8d88c708741b0c0587be609
Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic