]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote-tracking branch 'origin/divVerent/csad' into divVerent/csad
authorRudolf Polzer <divverent@xonotic.org>
Tue, 4 Dec 2012 16:38:35 +0000 (17:38 +0100)
committerRudolf Polzer <divverent@xonotic.org>
Tue, 4 Dec 2012 16:38:35 +0000 (17:38 +0100)
commit1b219f106c4eb8be2b42e3d2f443762e4d5d6263
tree9868b82e11795670d0966dc7155e0dfb9dd60efa
parent5d57b7221cb0a7e1e3b4d4eb78977ac1d2abb108
parent513e45b9e7d01e375e2f7a0a13b0436850bac347
Merge remote-tracking branch 'origin/divVerent/csad' into divVerent/csad

Conflicts:
qcsrc/client/csqcmodel_hooks.qc
qcsrc/client/csqcmodel_hooks.qc
qcsrc/server/cl_player.qc