projects
/
xonotic
/
netradiant.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
0138fcc
1e42a4f
)
Merge branch 'icculus'
author
Rudolf Polzer <divverent@alientrap.org>
Thu, 24 Jun 2010 10:30:02 +0000
(12:30 +0200)
committer
Rudolf Polzer <divverent@alientrap.org>
Thu, 24 Jun 2010 10:30:02 +0000
(12:30 +0200)
Trivial merge