]> 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: dd919fd 13ffcda)
Merge branch 'master' into debugger/tdm_netscore
authorDebugger <pyngot@hotmail.com>
Wed, 4 Sep 2013 23:10:37 +0000 (01:10 +0200)
committerDebugger <pyngot@hotmail.com>
Wed, 4 Sep 2013 23:10:37 +0000 (01:10 +0200)
1  2 
qcsrc/client/main.qh patch | diff1 | diff2 | blob | history
qcsrc/client/scoreboard.qc patch | diff1 | diff2 | blob | history

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