projects
/
xonotic
/
xonotic.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
2c4a7b5
fff4cea
)
Merge commit 'origin/esteel/ignore'
author
Rudolf Polzer <divverent@alientrap.org>
Thu, 22 Apr 2010 13:48:35 +0000
(15:48 +0200)
committer
Rudolf Polzer <divverent@alientrap.org>
Thu, 22 Apr 2010 13:48:35 +0000
(15:48 +0200)
Trivial merge