]> 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: 9f4048f 7ddcceb)
Merge branch 'master' into Mario/csqc_models
authorMario <mario.mario@y7mail.com>
Sat, 12 Oct 2013 02:03:38 +0000 (13:03 +1100)
committerMario <mario.mario@y7mail.com>
Sat, 12 Oct 2013 02:03:38 +0000 (13:03 +1100)

Trivial merge