projects
/
xonotic
/
xonotic-maps.pk3dir.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
f2938bc
9e1249a
)
Merge branch 'master' into cbrutail/g-23_cant_take_it_anymore
author
cbrutail <ruszkai.akos@gmail.com>
Fri, 30 Dec 2011 14:33:32 +0000
(15:33 +0100)
committer
cbrutail <ruszkai.akos@gmail.com>
Fri, 30 Dec 2011 14:33:32 +0000
(15:33 +0100)
Trivial merge
projects / xonotic / xonotic-maps.pk3dir.git / commitdiff