Merge branch 'master' into terencehill/cursormode
authorterencehill <piuntn@gmail.com>
Wed, 9 Nov 2011 23:35:06 +0000 (00:35 +0100)
committerterencehill <piuntn@gmail.com>
Wed, 9 Nov 2011 23:35:06 +0000 (00:35 +0100)
commitfbec40012e84855d10d0f99f2ead025aca3153c6
treebbe5e3248d4f6a7ff651f59bedfe876e2ef74daf
parentffa05049ee992833e194e2da30de04452f2324e0
parent87bcf91b0bb31ca5292d26e18026b628db6185fa
Merge branch 'master' into terencehill/cursormode
qcsrc/client/Main.qc
qcsrc/client/View.qc