]> 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: 10d80d4 6592a0b)
Merge remote branch 'origin/master' into samual/mutator_ctf
authorSamual <samual@xonotic.org>
Sat, 31 Mar 2012 16:13:43 +0000 (12:13 -0400)
committerSamual <samual@xonotic.org>
Sat, 31 Mar 2012 16:13:43 +0000 (12:13 -0400)
1  2 
qcsrc/server/miscfunctions.qc patch | diff1 | diff2 | blob | history

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