]> git.rm.cloudns.org Git - xonotic/darkplaces.git/commitdiff
Merge branch 'master' into divVerent/desktopfullscreen divVerent/desktopfullscreen
authorRudolf Polzer <divverent@xonotic.org>
Tue, 17 Sep 2013 19:31:33 +0000 (21:31 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Tue, 17 Sep 2013 19:31:33 +0000 (21:31 +0200)

Trivial merge