]> 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: 52590f0 0396c95)
Merge branch 'master' into terencehill/physics_panel_updates
authorterencehill <piuntn@gmail.com>
Tue, 29 Nov 2011 18:03:20 +0000 (19:03 +0100)
committerterencehill <piuntn@gmail.com>
Tue, 29 Nov 2011 18:03:20 +0000 (19:03 +0100)
1  2 
defaultXonotic.cfg patch | diff1 | diff2 | blob | history
qcsrc/client/autocvars.qh patch | diff1 | diff2 | blob | history
qcsrc/client/hud.qc patch | diff1 | diff2 | blob | history
qcsrc/client/hud_config.qc patch | diff1 | diff2 | blob | history

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