Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic
authorRudolf Polzer <divverent@xonotic.org>
Tue, 31 Jan 2012 20:54:43 +0000 (21:54 +0100)
committerRudolf Polzer <divverent@xonotic.org>
Tue, 31 Jan 2012 20:54:43 +0000 (21:54 +0100)
commitfd036680da98c60fb477f33424843b65e03b36b3
treee93eaaf8b89800d33b1bd7f4d2332e490218f771
parenta7aecff143878aab47a28d75a53c32a94f86a05e
parent432429d9521531c8c562720b11e5022e19eeeae1
Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic
all