projects
/
xonotic
/
netradiant.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
f021552
e703106
)
Merge remote branch 'origin/merlijn/osx-compile'
author
Rudolf Polzer <divverent@alientrap.org>
Wed, 1 Sep 2010 19:29:48 +0000
(21:29 +0200)
committer
Rudolf Polzer <divverent@alientrap.org>
Wed, 1 Sep 2010 19:29:48 +0000
(21:29 +0200)
Trivial merge