]> de.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: bed0faf 8c76eca)
Merge remote-tracking branch 'origin/master' into samual/combined_updates
authorSamual Lenks <samual@xonotic.org>
Sat, 25 Jan 2014 22:33:59 +0000 (17:33 -0500)
committerSamual Lenks <samual@xonotic.org>
Sat, 25 Jan 2014 22:33:59 +0000 (17:33 -0500)
1  2 
defaultXonotic.cfg patch | diff1 | diff2 | blob | history
qcsrc/common/util.qc patch | diff1 | diff2 | blob | history
qcsrc/common/util.qh patch | diff1 | diff2 | blob | history

diff --cc defaultXonotic.cfg
Simple merge
diff --cc qcsrc/common/util.qc
Simple merge
diff --cc qcsrc/common/util.qh
Simple merge