projects / xonotic / xonotic-maps.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a133c10 d4edbb5)
Merge branch 'cbrutail/reorganise_sounds1' into cbrutail/darkzone
authorcbrutail <ruszkai.akos@gmail.com>
Tue, 3 Jan 2012 23:46:24 +0000 (00:46 +0100)
committercbrutail <ruszkai.akos@gmail.com>
Tue, 3 Jan 2012 23:46:24 +0000 (00:46 +0100)

Trivial merge