Merge remote branch 'origin/terencehill/crosshair_colors'
authorRudolf Polzer <divVerent@xonotic.org>
Mon, 6 Dec 2010 08:41:56 +0000 (09:41 +0100)
committerRudolf Polzer <divVerent@xonotic.org>
Mon, 6 Dec 2010 08:41:56 +0000 (09:41 +0100)
commitf79b965d51821cdcef5065f2b3b6b545c6c24382
tree6ec84a93436a33d5deb6d14bf3a1f14b92c74268
parentee6e2d1de97777a4fdfdb750f412a12dce2178d7
parentcdf8d22631c0acdf97bd69bdd00ab86e96b30b73
Merge remote branch 'origin/terencehill/crosshair_colors'