← Back to branch summary

~osomon/webbrowser-app/qmltests

~osomon/webbrowser-app/qmltests

Viewing all changes in revision 1678.

Committer: Olivier Tilloy
Date: 2017-04-05 09:38:41 UTC
mfrom: (1564.2.79 staging)
Revision ID: olivier.tilloy@canonical.com-20170405093841-xwbwj9cio2ja73ot

Merge the latest changes from staging.

files removed:
src/app/qquickshortcut.cpp

src/app/qquickshortcut_p.h

files modified:
README.md

debian/control

src/app/CMakeLists.txt

src/app/browserapplication.cpp

src/app/webbrowser/Browser.qml

src/app/webbrowser/webbrowser-app.qml

src/app/webcontainer/WebApp.qml

tests/qmltests/webbrowser-app/CMakeLists.txt

tests/qmltests/webbrowser-app/webbrowser-app-qmltests-launcher.cpp

Show diffs side-by-side

added added

removed removed

src/app/CMakeLists.txt

src/app/browserapplication.cpp

src/app/qquickshortcut.cpp

src/app/qquickshortcut_p.h

src/app/webbrowser/Browser.qml

src/app/webbrowser/webbrowser-app.qml

src/app/webcontainer/WebApp.qml

tests/qmltests/webbrowser-app/CMakeLists.txt

tests/qmltests/webbrowser-app/webbrowser-app-qmltests-launcher.cpp

Older »