Merge branch 'master' into divVerent/desktopfullscreen
authorRudolf Polzer <divverent@xonotic.org>
Wed, 18 Sep 2013 09:43:20 +0000 (11:43 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Wed, 18 Sep 2013 09:43:20 +0000 (11:43 +0200)
commit836a4c13102f402edcbf6f29160f84b8a70d2648
treeebe8e2affcdd066bbd074f05a074f47da6a0a46c
parent72e511075f59964c08da345dbafc5159e55249e5
parentc46403828e0159586147c98a4e22b0059db6a641
Merge branch 'master' into divVerent/desktopfullscreen