]> 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: bd85f2c 7e9d440)
Merge branch 'master' into terencehill/hud_code_cleanup
authorterencehill <piuntn@gmail.com>
Thu, 30 Jan 2014 00:59:33 +0000 (01:59 +0100)
committerterencehill <piuntn@gmail.com>
Thu, 30 Jan 2014 00:59:33 +0000 (01:59 +0100)
1  2 
qcsrc/client/Main.qc patch | diff1 | diff2 | blob | history
qcsrc/client/scoreboard.qc patch | diff1 | diff2 | blob | history

diff --cc qcsrc/client/Main.qc
Simple merge
diff --cc qcsrc/client/scoreboard.qc
Simple merge