Viewing all changes in revision 1018.
- Committer: Olivier Tilloy
- Date: 2015-07-03 15:20:17 UTC
- mfrom: (1002.1.78 webbrowser-app)
- Revision ID: olivier.tilloy@canonical.com-20150703152017-p0fpy6xvjgmcxyww
Merge the latest changes from trunk and resolve conflicts.
- files added:
- src/app/webbrowser/BookmarkOptions.qml
- tests/unittests/bookmarks-folder-model
- tests/unittests/bookmarks-folderlist-model
- files removed:
- src/app/webcontainer/AccountsModel.qml
- files renamed:
- src/app/webcontainer/AccountItemView.qml => src/app/webcontainer/AccountItem.qml
- src/app/webcontainer/AccountsLoginPage.qml => src/app/webcontainer/AccountsLogic.qml
- files modified:
- debian/changelog
expand all
collapse all
added
removed
