projects
/
xonotic
/
xonotic-data.pk3dir.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
bc51fd3
a39b472
)
Merge branch 'tzork/ents-onoff' of ssh://git.xonotic.org/xonotic-data.pk3dir into...
author
Jakob MG <jakob_mg@hotmail.com>
Tue, 28 Sep 2010 15:43:19 +0000
(17:43 +0200)
committer
Jakob MG <jakob_mg@hotmail.com>
Tue, 28 Sep 2010 15:43:19 +0000
(17:43 +0200)
Trivial merge
projects / xonotic / xonotic-data.pk3dir.git / commitdiff