Merge branch 'master' of https://vcs.maemo.org/git/presencevnc
authorChristian Pulvermacher <pulvermacher@gmx.de>
Wed, 1 Feb 2012 22:36:35 +0000 (23:36 +0100)
committerChristian Pulvermacher <pulvermacher@gmx.de>
Wed, 1 Feb 2012 22:36:35 +0000 (23:36 +0100)
commitaedad407c23be9b6878fe5ebc1784264054258bf
tree0257eb143db9399269bfe9dadef1257f3058a927
parentf5ceceead97629d1278a5a95aa0f2c28355c352e
parent7f4b9e15b4ddabb36d6d3471bdd7acdcb38eb7f5
Merge branch 'master' of https://vcs.maemo.org/git/presencevnc
src/mainwindow.cpp
src/vncview.cpp