]> 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: 2641ef2 86f116a)
Merge remote-tracking branch 'origin/master' into tzork/vehicles-2
authorJakob MG <jakob_mg@hotmail.com>
Tue, 5 Apr 2011 20:40:06 +0000 (22:40 +0200)
committerJakob MG <jakob_mg@hotmail.com>
Tue, 5 Apr 2011 20:40:06 +0000 (22:40 +0200)
1  2 
qcsrc/client/hud.qc patch | diff1 | diff2 | blob | history
qcsrc/server/cl_player.qc patch | diff1 | diff2 | blob | history

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