]> de.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: 6e04cb9 043b5eb)
Merge branch 'master' into terencehill/newpanelhud-dom_points
authorterencehill <piuntn@gmail.com>
Fri, 13 Aug 2010 20:25:53 +0000 (22:25 +0200)
committerterencehill <piuntn@gmail.com>
Fri, 13 Aug 2010 20:25:53 +0000 (22:25 +0200)
1  2 
defaultXonotic.cfg patch | diff1 | diff2 | blob | history
qcsrc/client/hud.qc patch | diff1 | diff2 | blob | history
qcsrc/common/constants.qh patch | diff1 | diff2 | blob | history
qcsrc/server/cl_client.qc patch | diff1 | diff2 | blob | history

diff --cc defaultXonotic.cfg
Simple merge
diff --cc qcsrc/client/hud.qc
Simple merge
diff --cc qcsrc/common/constants.qh
Simple merge
diff --cc qcsrc/server/cl_client.qc
Simple merge