]> 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: 223fa1d 9944e4f)
Merge branch 'master' into Mario/csqc_models
authorMario <mario.mario@y7mail.com>
Mon, 7 Oct 2013 09:14:56 +0000 (02:14 -0700)
committerMario <mario.mario@y7mail.com>
Mon, 7 Oct 2013 09:14:56 +0000 (02:14 -0700)

Trivial merge