]> 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: 72d3ad3 ac1212d)
Merge remote-tracking branch 'origin/samual/flyingspectators'
authormand1nga <mand1nga@xonotic.org>
Sun, 21 Aug 2011 03:10:17 +0000 (00:10 -0300)
committermand1nga <mand1nga@xonotic.org>
Sun, 21 Aug 2011 03:10:17 +0000 (00:10 -0300)
1  2 
defaultXonotic.cfg patch | diff1 | diff2 | blob | history
qcsrc/server/miscfunctions.qc patch | diff1 | diff2 | blob | history

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