Merge remote-tracking branch 'origin/samual/crosshair_ring_updates'
authorRudolf Polzer <divverent@alientrap.org>
Tue, 1 Mar 2011 18:09:46 +0000 (19:09 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Tue, 1 Mar 2011 18:09:46 +0000 (19:09 +0100)
commitcc1a3ab87fdc6efac20c1224fffdfbe8379b44fb
tree42a58abd1f30b2fc7eed4d5de5698ceea1f9855f
parent89ca6312ec5228acf4fc8cf705f990d7c1a00786
parentb43fcd26bdaa013eb27d20bf4f9bc4db853181de
Merge remote-tracking branch 'origin/samual/crosshair_ring_updates'