]> de.git.xonotic.org Git - xonotic/xonotic.git/commitdiff
projects / xonotic / xonotic.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cb03dbd c185cf2)
Merge remote branch 'refs/remotes/origin/merlijn/macosx-fixes'
authorRudolf Polzer <divverent@alientrap.org>
Sun, 13 Jun 2010 19:27:27 +0000 (21:27 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Sun, 13 Jun 2010 19:27:27 +0000 (21:27 +0200)

Trivial merge