]> 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: 098f27a 47d0cce)
Merge remote-tracking branch 'origin/master' into samual/notification_rewrite
authorSamual Lenks <samual@xonotic.org>
Tue, 5 Feb 2013 17:04:19 +0000 (12:04 -0500)
committerSamual Lenks <samual@xonotic.org>
Tue, 5 Feb 2013 17:04:19 +0000 (12:04 -0500)
1  2 
defaultXonotic.cfg patch | diff1 | diff2 | blob | history
qcsrc/client/View.qc patch | diff1 | diff2 | blob | history
qcsrc/client/autocvars.qh patch | diff1 | diff2 | blob | history

diff --cc defaultXonotic.cfg
Simple merge
diff --cc qcsrc/client/View.qc
Simple merge
diff --cc qcsrc/client/autocvars.qh
Simple merge