Merge remote branch 'origin/terencehill/small_cleanup'
authorRudolf Polzer <divverent@alientrap.org>
Thu, 9 Dec 2010 20:04:43 +0000 (21:04 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Thu, 9 Dec 2010 20:04:43 +0000 (21:04 +0100)
commit3188aedc78fc6c0f613adbfe8f1297ef5cb6a730
tree87f59d836f67fe8865baafdeb6417bfeb2476e4d
parent57c5dfd12fc3f7ce7b2bc844325a2c85929f10de
parent86b7c6ee347d181bee3f477cda4e9bfd25882be1
Merge remote branch 'origin/terencehill/small_cleanup'

Conflicts:
qcsrc/client/waypointsprites.qc
qcsrc/client/hud.qc
qcsrc/client/waypointsprites.qc