]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 957a1fd cf640e2)
Merge remote branch 'origin/samual/newsounds'
authorRudolf Polzer <divverent@alientrap.org>
Wed, 1 Dec 2010 16:47:10 +0000 (17:47 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Wed, 1 Dec 2010 16:47:10 +0000 (17:47 +0100)

Trivial merge