← Back to branch summary

~phablet-team/webbrowser-app/trunk

~phablet-team/webbrowser-app/trunk

Viewing all changes in revision 1329.3.18.

Committer: Olivier Tilloy
Date: 2016-03-10 05:56:42 UTC
mfrom: (1378 webbrowser-app)
mto: This revision was merged to the branch mainline in revision 1380.
Revision ID: olivier.tilloy@canonical.com-20160310055642-gcuwehtae8uq8hyr

Merge the latest changes from trunk and resolve conflicts.

files added:
src/app/webcontainer/WebappWebview.qml

files renamed:
src/app/webbrowser/ContentHandler.qml => src/app/ContentHandler.qml

files modified:
debian/changelog

po/cy.po

src/app/webbrowser/Browser.qml

src/app/webbrowser/ContentDownloadDialog.qml

src/app/webbrowser/ContentPickerDialog.qml

src/app/webbrowser/DownloadsPage.qml

src/app/webcontainer/ContentDownloadDialog.qml

src/app/webcontainer/ContentPickerDialog.qml

src/app/webcontainer/PopupWindowController.qml

src/app/webcontainer/PopupWindowOverlay.qml

src/app/webcontainer/WebViewImplOxide.qml

src/app/webcontainer/WebappContainerWebview.qml

tests/autopilot/webapp_container/tests/fake_servers.py

tests/autopilot/webapp_container/tests/test_context_menu.py

Show diffs side-by-side

added added

removed removed

debian/changelog

src/app/ContentHandler.qml

src/app/webbrowser/Browser.qml

src/app/webbrowser/ContentDownloadDialog.qml

src/app/webbrowser/ContentPickerDialog.qml

src/app/webbrowser/DownloadsPage.qml

src/app/webcontainer/ContentDownloadDialog.qml

src/app/webcontainer/ContentPickerDialog.qml

src/app/webcontainer/PopupWindowController.qml

src/app/webcontainer/PopupWindowOverlay.qml

src/app/webcontainer/WebViewImplOxide.qml

src/app/webcontainer/WebappContainerWebview.qml

src/app/webcontainer/WebappWebview.qml

tests/autopilot/webapp_container/tests/fake_servers.py

tests/autopilot/webapp_container/tests/test_context_menu.py

Older »