Merge remote branch 'origin/master' into samual/crosshair_ring_updates
authorSamual <samual@xonotic.org>
Thu, 24 Feb 2011 02:23:21 +0000 (21:23 -0500)
committerSamual <samual@xonotic.org>
Thu, 24 Feb 2011 02:23:21 +0000 (21:23 -0500)
commitb43fcd26bdaa013eb27d20bf4f9bc4db853181de
tree86b2602ce1310886d9c3da4a9841c5490a488f59
parent8a8f98e4be0e84d286c1a5002bfe7fcfa2d7ccbb
parenta8f17a654113be7b43f1812c42156bdc9b335856
Merge remote branch 'origin/master' into samual/crosshair_ring_updates