projects
/
xonotic
/
xonotic-maps.pk3dir.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
4e2a9eb
f431dfe
)
Merge remote-tracking branch 'origin/matthiaskrgr/scrnshot_ents'
author
Rudolf Polzer <divverent@xonotic.org>
Sat, 13 Jul 2013 09:16:56 +0000
(11:16 +0200)
committer
Rudolf Polzer <divverent@xonotic.org>
Sat, 13 Jul 2013 09:16:56 +0000
(11:16 +0200)
Trivial merge
projects / xonotic / xonotic-maps.pk3dir.git / commitdiff