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