Merge remote branch 'refs/remotes/origin/mirceakitsune/pickup_crosshair'
authorRudolf Polzer <divverent@alientrap.org>
Sun, 31 Oct 2010 13:40:16 +0000 (14:40 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Sun, 31 Oct 2010 13:40:16 +0000 (14:40 +0100)
commit2805e22b6636b63410a30e4fec68e1ae5ecadc87
tree169c0b4f43ddf260bbbf770c4fade427ea250637
parent14166dc49a1a3dea877ccb58f18a85e7f60f9ddf
parent823ef1d1838c8868fe53c9cb781665e33b0b47dc
Merge remote branch 'refs/remotes/origin/mirceakitsune/pickup_crosshair'