projects / presencevnc / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f5cecee 7f4b9e1)
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)
1  2 
src/mainwindow.cpp patch | diff1 | diff2 | blob | history
src/vncview.cpp patch | diff1 | diff2 | blob | history

diff --cc src/mainwindow.cpp
Simple merge
diff --cc src/vncview.cpp
Simple merge
Unnamed repository; edit this file to name it for gitweb.