]> git.xonotic.org Git - xonotic/xonotic.git/commit
Merge branch 'master' of http://de.git.xonotic.org/xonotic/xonotic
authorRudolf Polzer <divverent@xonotic.org>
Mon, 24 Sep 2012 11:45:14 +0000 (13:45 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Mon, 24 Sep 2012 11:45:14 +0000 (13:45 +0200)
commit1e6fef74b8e7d575fb09e882f7506a592cacc5f0
tree30cc41e325992066ad2cdaf51efc3ddc9a7bef9e
parent0a6b93cb7ac69c914fef9c15236834f69c5cf1e4
parentf9c0c1c0fb0502fbc5c19b506d28f73a102ee5b6
Merge branch 'master' of http://de.git.xonotic.org/xonotic/xonotic