← Back to branch summary

~osomon/webbrowser-app/official-api

~osomon/webbrowser-app/official-api

Viewing all changes in revision 564.

Committer: Olivier Tilloy
Date: 2014-06-05 10:11:19 UTC
mfrom: (554.1.3 webbrowser-app)
Revision ID: olivier.tilloy@canonical.com-20140605101119-1lh7b3gajvgw5qbd

Merge the latest changes from trunk and resolve a conflict.

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

src/app/webcontainer/chrome-cookie-store.cpp

src/app/webcontainer/chrome-cookie-store.h

src/app/webcontainer/webkit-cookie-store.cpp

src/app/webcontainer/webkit-cookie-store.h

tests/unittests/cookie-store

tests/unittests/cookie-store/CMakeLists.txt

tests/unittests/cookie-store/tst_CookieStore.cpp

files removed:
src/app/webcontainer/sqlitecookiestore.cpp

src/app/webcontainer/sqlitecookiestore.h

files renamed:
src/app/webcontainer/cookiestore.cpp => src/app/webcontainer/cookie-store.cpp

src/app/webcontainer/cookiestore.h => src/app/webcontainer/cookie-store.h

src/app/webcontainer/onlineaccountscookiestore.cpp => src/app/webcontainer/online-accounts-cookie-store.cpp

src/app/webcontainer/onlineaccountscookiestore.h => src/app/webcontainer/online-accounts-cookie-store.h

files modified:
debian/changelog

debian/control

po/lv.po

src/app/browserapplication.cpp

src/app/browserapplication.h

src/app/webcontainer/CMakeLists.txt

src/app/webcontainer/webapp-container.cpp

src/app/webcontainer/webapp-container.h

src/app/webcontainer/webapp-container.qml

tests/unittests/CMakeLists.txt

Show diffs side-by-side

added added

removed removed

debian/changelog

src/app/browserapplication.cpp

src/app/browserapplication.h

src/app/webcontainer/AccountsPage.qml

src/app/webcontainer/CMakeLists.txt

src/app/webcontainer/sqlitecookiestore.cpp

src/app/webcontainer/sqlitecookiestore.h

src/app/webcontainer/webapp-container.cpp

src/app/webcontainer/webapp-container.h

src/app/webcontainer/webapp-container.qml

tests/unittests/CMakeLists.txt

Older »