]> 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 | compact (merge: 2c20e36 39c6fe8)
Merge branch 'master' into Mario/csqc_models
authorMario <mario.mario@y7mail.com>
Mon, 21 Oct 2013 08:38:12 +0000 (19:38 +1100)
committerMario <mario.mario@y7mail.com>
Mon, 21 Oct 2013 08:38:12 +0000 (19:38 +1100)

Trivial merge