]> git.rm.cloudns.org Git - xonotic/xonotic.git/commit
Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic
authorRudolf Polzer <divverent@alientrap.org>
Fri, 21 Sep 2012 18:40:53 +0000 (20:40 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Fri, 21 Sep 2012 18:40:53 +0000 (20:40 +0200)
commitf9c0c1c0fb0502fbc5c19b506d28f73a102ee5b6
tree616630bfce80a4cb50f7058f1b0dae6af0283771
parent8f24d0a7732443b5f99735868a909e33641589d7
parent29a0f2021bf5838bdff001d2045dccf8d895515c
Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic