]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c03a44f 3052269)
Merge remote branch 'origin/terencehill/incompatible_mutators'
authorSamual <samual@xonotic.org>
Sun, 26 Feb 2012 01:07:06 +0000 (20:07 -0500)
committerSamual <samual@xonotic.org>
Sun, 26 Feb 2012 01:07:06 +0000 (20:07 -0500)
1  2 
qcsrc/server/miscfunctions.qc patch | diff1 | diff2 | blob | history

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