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)
1  2 
qcsrc/client/Main.qc
qcsrc/client/View.qc

Simple merge
Simple merge