]> 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: d3ad6bb 4f14e18)
Merge branch 'master' into Mario/gametype_votes
authorMario <zacjardine@y7mail.com>
Tue, 4 Nov 2014 06:09:45 +0000 (17:09 +1100)
committerMario <zacjardine@y7mail.com>
Tue, 4 Nov 2014 06:09:45 +0000 (17:09 +1100)
1  2 
qcsrc/common/constants.qh patch | diff1 | diff2 | blob | history

diff --cc qcsrc/common/constants.qh
Simple merge