]> 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: 6cb262c 5de3300)
Merge remote branch 'origin/master' into tzork/csqc-items
authorJakob MG <jakob_mg@hotmail.com>
Tue, 27 Mar 2012 14:47:32 +0000 (16:47 +0200)
committerJakob MG <jakob_mg@hotmail.com>
Tue, 27 Mar 2012 14:47:32 +0000 (16:47 +0200)

Trivial merge