]> 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: 93c49cf 646081a)
Merge branch 'master' into terencehill/quickmenu
authorterencehill <piuntn@gmail.com>
Thu, 27 Aug 2015 15:18:41 +0000 (17:18 +0200)
committerterencehill <piuntn@gmail.com>
Thu, 27 Aug 2015 15:18:41 +0000 (17:18 +0200)
1  2 
qcsrc/client/hud.qc patch | diff1 | diff2 | blob | history
qcsrc/client/main.qc patch | diff1 | diff2 | blob | history
qcsrc/client/scoreboard.qc patch | diff1 | diff2 | blob | history
qcsrc/client/view.qc patch | diff1 | diff2 | blob | history

diff --cc qcsrc/client/hud.qc
Simple merge
diff --cc qcsrc/client/main.qc
Simple merge
diff --cc qcsrc/client/scoreboard.qc
Simple merge
diff --cc qcsrc/client/view.qc
Simple merge