]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 38a4927 a5f8cbe)
Merge commit 'a5f8cbe456bed48c2c7b5d666e30cbaa344e6e33'
authorJakob MG <jakob_mg@hotmail.com>
Sun, 13 Mar 2011 22:03:52 +0000 (23:03 +0100)
committerJakob MG <jakob_mg@hotmail.com>
Sun, 13 Mar 2011 22:47:39 +0000 (23:47 +0100)

Trivial merge