projects
/
xonotic
/
xonotic-maps.pk3dir.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
7f7c021
39c2a08
)
Merge branch 'master' into fruitiex/runningmanctf
author
Rudolf Polzer <divVerent@xonotic.org>
Thu, 21 Oct 2010 11:29:57 +0000
(13:29 +0200)
committer
Rudolf Polzer <divVerent@xonotic.org>
Thu, 21 Oct 2010 11:29:57 +0000
(13:29 +0200)
Conflicts:
sound/wind/WindDesert-Loop.wav
sounds/wind/WindDesert-Loop.WAV
sounds/wind/WindDesert-Loop.wav
Trivial merge