]> 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: 6e0ac89 f2e0cd8)
Merge branch 'master' into terencehill/itemstime
authorterencehill <piuntn@gmail.com>
Fri, 6 Jan 2012 15:25:38 +0000 (16:25 +0100)
committerterencehill <piuntn@gmail.com>
Fri, 6 Jan 2012 15:25:38 +0000 (16:25 +0100)
1  2 
qcsrc/client/hud.qc patch | diff1 | diff2 | blob | history
qcsrc/server/cl_client.qc patch | diff1 | diff2 | blob | history
qcsrc/server/defs.qh patch | diff1 | diff2 | blob | history

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