]> 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: f189d02 64ddbee)
Merge branch 'master' into terencehill/newpanelhud
authorterencehill <piuntn@gmail.com>
Sat, 27 Nov 2010 23:06:41 +0000 (00:06 +0100)
committerterencehill <piuntn@gmail.com>
Sat, 27 Nov 2010 23:06:41 +0000 (00:06 +0100)
1  2 
qcsrc/client/Main.qc patch | diff1 | diff2 | blob | history
qcsrc/client/hud.qc patch | diff1 | diff2 | blob | history
qcsrc/client/hud.qh 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/hud.qc
Simple merge
diff --cc qcsrc/client/hud.qh
Simple merge
diff --cc qcsrc/client/scoreboard.qc
Simple merge