]> 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: 883f46c 9751ab0)
Merge remote-tracking branch 'origin/Mario/qc_updates' into Mario/qc_updates
authorTimePath <andrew.hardaker1995@gmail.com>
Sat, 24 Jan 2015 08:42:29 +0000 (19:42 +1100)
committerTimePath <andrew.hardaker1995@gmail.com>
Sat, 24 Jan 2015 08:42:29 +0000 (19:42 +1100)

Trivial merge