Merge branch 'master' into terencehill/color_picker_carets
authorterencehill <piuntn@gmail.com>
Mon, 27 Feb 2012 21:09:53 +0000 (22:09 +0100)
committerterencehill <piuntn@gmail.com>
Mon, 27 Feb 2012 21:09:53 +0000 (22:09 +0100)
1  2 
qcsrc/common/util.qc

Simple merge