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)
commit64b349a338c5355c1b1381ef0987e34c24fae75b
tree97c36aaa81957d21b482c68fc2f937d71f4a7f9d
parentfc32492badad91f3422c0f64482ad91d30243220
parent565804d0be0a14bc4412e7991a0831275819a307
Merge branch 'master' into terencehill/color_picker_carets
qcsrc/common/util.qc