]> git.xonotic.org Git - xonotic/xonotic.git/commitdiff
projects / xonotic / xonotic.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0c324e9 c09da75)
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