]> icculus.org git repositories - divverent/nexuiz.git/commit
Merge branch 'master' into fruitiex/panelhud
authorRasmus <rasse@rasse-desktop.(none)>
Tue, 9 Mar 2010 21:28:51 +0000 (23:28 +0200)
committerRasmus <rasse@rasse-desktop.(none)>
Tue, 9 Mar 2010 21:28:51 +0000 (23:28 +0200)
commit213ed987bf44245b2e52ed1d35bfe6fd75b2592f
treec6602d54d17941503be1327490eee7c8957b0d67
parent27956d3db1922a6238a782ce8f074df1ff95ca13
parent69a1e641389794799ffcefa947fc1e12ad1f7175
Merge branch 'master' into fruitiex/panelhud

Conflicts:
data/qcsrc/client/View.qc
data/qcsrc/client/Main.qc
data/qcsrc/client/View.qc
data/qcsrc/client/progs.src
data/qcsrc/common/constants.qh
data/qcsrc/common/util.qh
data/qcsrc/server/miscfunctions.qc