]> 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: 147ece6 2eb6671)
Merge branch 'master' into terencehill/hud_code_restructure
authorterencehill <piuntn@gmail.com>
Sun, 31 Mar 2013 22:16:26 +0000 (00:16 +0200)
committerterencehill <piuntn@gmail.com>
Sun, 31 Mar 2013 22:16:26 +0000 (00:16 +0200)
1  2 
qcsrc/client/Main.qc 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.qh patch | diff1 | diff2 | blob | history

diff --cc qcsrc/client/Main.qc
Simple merge
diff --cc qcsrc/client/autocvars.qh
Simple merge
diff --cc qcsrc/client/hud.qc
Simple merge
diff --cc qcsrc/client/hud.qh
Simple merge