]> 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: 972da39 c9817f1)
Merge branch 'master' into Mario/spawnsystem_mutator
authorMario <mario.mario@y7mail.com>
Tue, 1 Oct 2013 16:16:30 +0000 (09:16 -0700)
committerMario <mario.mario@y7mail.com>
Tue, 1 Oct 2013 16:16:30 +0000 (09:16 -0700)
1  2 
qcsrc/server/autocvars.qh patch | diff1 | diff2 | blob | history
qcsrc/server/miscfunctions.qc patch | diff1 | diff2 | blob | history

diff --cc qcsrc/server/autocvars.qh
Simple merge
diff --cc qcsrc/server/miscfunctions.qc
Simple merge