]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge branch 'master' into terencehill/centerprint_stuff
authorterencehill <piuntn@gmail.com>
Sat, 16 Jul 2011 20:37:21 +0000 (22:37 +0200)
committerterencehill <piuntn@gmail.com>
Sat, 16 Jul 2011 20:37:21 +0000 (22:37 +0200)
14 files changed:
1  2 
defaultXonotic.cfg
qcsrc/client/Main.qc
qcsrc/client/View.qc
qcsrc/client/autocvars.qh
qcsrc/client/hud.qh
qcsrc/client/main.qh
qcsrc/client/miscfunctions.qc
qcsrc/client/scoreboard.qc
qcsrc/common/constants.qh
qcsrc/server/ctf.qc
qcsrc/server/defs.qh
qcsrc/server/mutators/gamemode_keepaway.qc
qcsrc/server/t_items.qc
qcsrc/server/w_minstanex.qc

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge