]> 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: 1846e8f ad76a3d)
Merge remote branch 'origin/master' into samual/hud_updates
authorSamual <samual@xonotic.org>
Tue, 25 Oct 2011 15:02:41 +0000 (11:02 -0400)
committerSamual <samual@xonotic.org>
Tue, 25 Oct 2011 15:02:41 +0000 (11:02 -0400)
1  2 
qcsrc/client/View.qc patch | diff1 | diff2 | blob | history
qcsrc/client/hud_config.qc patch | diff1 | diff2 | blob | history
qcsrc/server/g_world.qc patch | diff1 | diff2 | blob | history

diff --cc qcsrc/client/View.qc
Simple merge
diff --cc qcsrc/client/hud_config.qc
Simple merge
diff --cc qcsrc/server/g_world.qc
Simple merge