]> 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: 3d81bed 656ec32)
Merge remote branch 'origin/master' into terencehill/maximized_radar
authorSamual <samual@xonotic.org>
Fri, 14 Oct 2011 18:12:44 +0000 (14:12 -0400)
committerSamual <samual@xonotic.org>
Fri, 14 Oct 2011 18:12:44 +0000 (14:12 -0400)
1  2 
defaultXonotic.cfg patch | diff1 | diff2 | blob | history
qcsrc/client/Main.qc patch | diff1 | diff2 | blob | history
qcsrc/client/hud.qc patch | diff1 | diff2 | blob | history
qcsrc/client/teamradar.qc patch | diff1 | diff2 | blob | history

diff --cc defaultXonotic.cfg
Simple merge
diff --cc qcsrc/client/Main.qc
Simple merge
diff --cc qcsrc/client/hud.qc
Simple merge
diff --cc qcsrc/client/teamradar.qc
Simple merge