projects
/
xonotic
/
netradiant.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
dba712a
48410b1
)
Merge commit '48410b113dd2036e69dbf723a39ec9af02fc9b12'
author
Rudolf Polzer <divverent@alientrap.org>
Tue, 27 Mar 2012 09:33:51 +0000
(11:33 +0200)
committer
Rudolf Polzer <divverent@alientrap.org>
Tue, 27 Mar 2012 09:33:51 +0000
(11:33 +0200)
Trivial merge