← Back to branch summary

~michael-sheldon/webbrowser-app/file-upload

~michael-sheldon/webbrowser-app/file-upload

Viewing all changes in revision 444.

Committer: Michael Sheldon
Date: 2014-04-10 14:42:57 UTC
mfrom: (409.1.78 webbrowser-app)
Revision ID: michael.sheldon@canonical.com-20140410144257-jkwpylegzoxck3wl

Merge from trunk

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

src/app/webcontainer/session-utils.cpp

src/app/webcontainer/session-utils.h

tests/unittests/session-utils

tests/unittests/session-utils/CMakeLists.txt

tests/unittests/session-utils/tst_SessionUtilsTests.cpp

files modified:
debian/changelog

debian/control

src/Ubuntu/Components/Extras/Browser/UbuntuWebContext.qml

src/Ubuntu/Components/Extras/Browser/UbuntuWebView02.qml

src/app/webcontainer/CMakeLists.txt

src/app/webcontainer/WebappContainerWebview.qml

src/app/webcontainer/url-pattern-utils.cpp

src/app/webcontainer/url-pattern-utils.h

src/app/webcontainer/webapp-container.cpp

src/app/webcontainer/webapp-container.h

tests/unittests/CMakeLists.txt

tests/unittests/container-url-patterns/tst_ContainerUrlPatterns.cpp

Show diffs side-by-side

added added

removed removed

debian/changelog

src/Ubuntu/Components/Extras/Browser/UbuntuWebContext.qml

src/Ubuntu/Components/Extras/Browser/UbuntuWebView02.qml

src/app/webcontainer/CMakeLists.txt

src/app/webcontainer/WebViewImplOxide.qml

src/app/webcontainer/WebappContainerWebview.qml

src/app/webcontainer/session-utils.cpp

src/app/webcontainer/session-utils.h

src/app/webcontainer/url-pattern-utils.cpp

src/app/webcontainer/url-pattern-utils.h

src/app/webcontainer/webapp-container.cpp

src/app/webcontainer/webapp-container.h

tests/unittests/CMakeLists.txt

tests/unittests/container-url-patterns/tst_ContainerUrlPatterns.cpp

tests/unittests/session-utils/

tests/unittests/session-utils/CMakeLists.txt

tests/unittests/session-utils/tst_SessionUtilsTests.cpp

Older »