Merge branch 'master' into terencehill/crosshair_colors
authorterencehill <piuntn@gmail.com>
Sat, 4 Dec 2010 19:11:03 +0000 (20:11 +0100)
committerterencehill <piuntn@gmail.com>
Sat, 4 Dec 2010 19:11:03 +0000 (20:11 +0100)
commitcdf8d22631c0acdf97bd69bdd00ab86e96b30b73
tree6ec84a93436a33d5deb6d14bf3a1f14b92c74268
parent1977289753ace53b56568e20858073379b3a4f6e
parenta09ff43560675812e506d6d425c6dd829911b990
Merge branch 'master' into terencehill/crosshair_colors
defaultXonotic.cfg