projects
/
xonotic
/
xonotic-maps.pk3dir.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
587277a
baf1d48
)
Merge remote-tracking branch 'origin/debugger/exomorphx', fixing #1751
author
Rudolf Polzer <divverent@xonotic.org>
Wed, 14 Aug 2013 08:17:06 +0000
(10:17 +0200)
committer
Rudolf Polzer <divverent@xonotic.org>
Wed, 14 Aug 2013 08:20:44 +0000
(10:20 +0200)
Trivial merge
projects / xonotic / xonotic-maps.pk3dir.git / commitdiff