projects
/
xonotic
/
xonotic-maps.pk3dir.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
df9031d
e40b8b5
)
Merge branch 'master' into cbrutail/map-lightspeed
author
cbrutail <ruszkai.akos@gmail.com>
Thu, 2 Jun 2011 21:43:38 +0000
(23:43 +0200)
committer
cbrutail <ruszkai.akos@gmail.com>
Thu, 2 Jun 2011 21:43:38 +0000
(23:43 +0200)
Trivial merge