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)
1  2 
defaultXonotic.cfg

Simple merge