]> 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: c545f11 0031d67)
Merge remote-tracking branch 'origin/master' into samual/weapons
authorSamual Lenks <samual@xonotic.org>
Wed, 10 Jul 2013 06:28:33 +0000 (02:28 -0400)
committerSamual Lenks <samual@xonotic.org>
Wed, 10 Jul 2013 06:28:33 +0000 (02:28 -0400)
1  2 
qcsrc/client/Main.qc patch | diff1 | diff2 | blob | history
qcsrc/server/miscfunctions.qc patch | diff1 | diff2 | blob | history

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