projects
/
xonotic
/
xonotic-maps.pk3dir.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
7c24962
dd74a05
)
Merge branch 'master' into tzork/nexballarena
author
cbrutail <ruszkai.akos@gmail.com>
Wed, 3 Nov 2010 18:41:11 +0000
(19:41 +0100)
committer
cbrutail <ruszkai.akos@gmail.com>
Wed, 3 Nov 2010 18:41:11 +0000
(19:41 +0100)
Trivial merge
projects / xonotic / xonotic-maps.pk3dir.git / commitdiff