projects
/
xonotic
/
xonotic-maps.pk3dir.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
da27676
47cd846
)
Merge remote branch 'origin/fruitiex/effect_e8circle'
author
Rudolf Polzer <divverent@alientrap.org>
Sat, 2 Oct 2010 11:46:45 +0000
(13:46 +0200)
committer
Rudolf Polzer <divverent@alientrap.org>
Sat, 2 Oct 2010 11:46:45 +0000
(13:46 +0200)
Trivial merge
projects / xonotic / xonotic-maps.pk3dir.git / commitdiff