projects
/
xonotic
/
xonotic-maps.pk3dir.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
ca1abd9
c1da0ff
)
Merge branch 'master' into divVerent/skyboxes
author
Rudolf Polzer <divverent@alientrap.org>
Fri, 6 Aug 2010 23:01:08 +0000
(
01:01
+0200)
committer
Rudolf Polzer <divverent@alientrap.org>
Fri, 6 Aug 2010 23:01:08 +0000
(
01:01
+0200)
Trivial merge