]> git.rm.cloudns.org Git - xonotic/xonotic.git/commitdiff
Merge remote-tracking branch 'origin/merlijn/osxlion-windowed'
authorRudolf Polzer <divverent@alientrap.org>
Thu, 1 Sep 2011 08:20:10 +0000 (10:20 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Thu, 1 Sep 2011 08:20:10 +0000 (10:20 +0200)

Trivial merge