]> git.rm.cloudns.org Git - xonotic/xonotic.git/commit
Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic
authorRudolf Polzer <divverent@xonotic.org>
Sat, 6 Aug 2011 18:26:01 +0000 (20:26 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Sat, 6 Aug 2011 18:26:01 +0000 (20:26 +0200)
commitbf55dfddb5544be8b8b49d02f11ca3a5e383a93f
tree94b3a2fe6adb4e2162b76d04a742aa249a092f96
parentbe47f868aa94ccfe736e3094ce205f593e55f26d
parent7f0123ca428c031539cea915380c48f75b4ba67e
Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic