Viewing all changes in revision 472.2.3.
- Committer: Olivier Tilloy
- Date: 2014-05-06 07:49:11 UTC
- mfrom: (521 webbrowser-app)
- mto: This revision was merged to the branch mainline in revision 522.
- Revision ID: olivier.tilloy@canonical.com-20140506074911-b30rju992xozxfry
Merge the latest changes from trunk and resolve a conflict.
- files added:
- debian/webapp-container-autopilot.install
- tests/autopilot/webapp_container
- tests/autopilot/webapp_container/tests
- tests/unittests/session-utils
- files removed:
- src/app/webbrowser/webthumbnail-provider.cpp
- files renamed:
- src/Ubuntu/Components/Extras/Browser/ItemSelector.qml => src/Ubuntu/Components/Extras/Browser/ItemSelector02.qml
- src/Ubuntu/Components/Extras/Browser/UbuntuWebView.qml => src/Ubuntu/Components/Extras/Browser/UbuntuWebView02.qml
- src/Ubuntu/Components/Extras/Browser/UserAgent.qml => src/Ubuntu/Components/Extras/Browser/UserAgent02.qml
- src/Ubuntu/Components/Extras/Browser/selection.js => src/Ubuntu/Components/Extras/Browser/selection02.js
- tests/unittests/container-url-patterns/tst_ContainerUrlPatterns.cpp => tests/unittests/container-url-patterns/tst_ContainerUrlPatternsTests.cpp
- tests/unittests/qml/tst_UbuntuWebView.qml => tests/unittests/qml/tst_UbuntuWebView02.qml
- files modified:
- .bzrignore
expand all
collapse all
added
removed
