]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into divVerent/csqcmodel
authorRudolf Polzer <divverent@xonotic.org>
Sun, 4 Dec 2011 15:37:25 +0000 (16:37 +0100)
committerRudolf Polzer <divverent@xonotic.org>
Sun, 4 Dec 2011 15:37:25 +0000 (16:37 +0100)
commit69ce389c2d8428de35bc392b7aa38b121632ca6c
tree4956bb9feb71ab317b52a6960dc7a47fed0abc51
parentf39915fb93a23a3c289000da21e7b16125b8f030
parent96d653c418485a1d27107dba9407b57a3d02e9fc
Merge branch 'master' into divVerent/csqcmodel

Conflicts:
qcsrc/client/View.qc
qcsrc/client/Main.qc
qcsrc/client/View.qc
qcsrc/client/progs.src