projects
/
xonotic
/
xonotic-data.pk3dir.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
69c041b
0f51dde
)
Merge remote branch 'origin/master' into tzork/csqc-items
author
Jakob MG <jakob_mg@hotmail.com>
Tue, 22 May 2012 12:09:49 +0000
(14:09 +0200)
committer
Jakob MG <jakob_mg@hotmail.com>
Tue, 22 May 2012 12:09:49 +0000
(14:09 +0200)
Trivial merge
projects / xonotic / xonotic-data.pk3dir.git / commitdiff