]> 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: 6f964ff a36e826)
Merge branch 'master' into terencehill/centerprint_stuff
authorterencehill <piuntn@gmail.com>
Tue, 24 May 2011 14:12:36 +0000 (16:12 +0200)
committerterencehill <piuntn@gmail.com>
Tue, 24 May 2011 14:12:36 +0000 (16:12 +0200)
1  2 
qcsrc/client/View.qc patch | diff1 | diff2 | blob | history
qcsrc/client/hud.qc patch | diff1 | diff2 | blob | history
qcsrc/server/cl_client.qc patch | diff1 | diff2 | blob | history

diff --cc qcsrc/client/View.qc
Simple merge
diff --cc qcsrc/client/hud.qc
Simple merge
diff --cc qcsrc/server/cl_client.qc
Simple merge