Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic-data.pk3dir
authorRudolf Polzer <divVerent@xonotic.org>
Mon, 13 Dec 2010 06:00:50 +0000 (07:00 +0100)
committerRudolf Polzer <divVerent@xonotic.org>
Mon, 13 Dec 2010 06:00:50 +0000 (07:00 +0100)
commitdc431797a5f45a7b71e2e2f418ef5b8162fc77ad
treeafae314440ec15ff5ed44b4e7737817f387b2658
parent5dc80d0c5e0c7dd4ae62aa7d01ea0767b6046d5e
parent1f7529fa0c7e0f2cc7f9da9558b9b5b5e7583d42
Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic-data.pk3dir
qcsrc/server/cl_client.qc
qcsrc/server/cl_player.qc