Viewing all changes in revision 778.
- Committer: Riccardo Padovani
- Date: 2015-06-12 09:40:27 UTC
- mfrom: (761.75.148 webbrowser-app)
- Revision ID: riccardo@rpadovani.com-20150612094027-m45snw575knv09py
Merge from upstream and fix conflicts
- files added:
- po/ia.po
- src/app/unity8
- src/app/unity8/libs
- src/app/unity8/libs/UbuntuGestures
- src/app/unity8/plugins
- src/app/unity8/plugins/Ubuntu
- src/app/unity8/plugins/Ubuntu/Gestures
- src/app/webbrowser/searchengines
- tests/unittests/search-engine
- tests/unittests/top-sites-model
- files removed:
- src/Ubuntu/Components/Extras/Browser/ItemSelector01.qml
- src/Ubuntu/Components/Extras/Browser/favicon-image-provider.cpp
- src/Ubuntu/Components/Extras/Browser/favicon-image-provider.h
- src/app/webbrowser/upstreamcomponents
- tests/unittests/history-byvisits-model
- files renamed:
- src/app/webbrowser/BookmarksList.qml => src/app/webbrowser/UrlsList.qml
- src/app/webbrowser/assets/tab-header-center.png => src/app/webbrowser/assets/tab-header-center@27.png
- src/app/webbrowser/assets/tab-header-left.png => src/app/webbrowser/assets/tab-header-left@27.png
- src/app/webbrowser/assets/tab-header-right.png => src/app/webbrowser/assets/tab-header-right@27.png
- tests/autopilot/webapp_container/tests/test_chrome_setup.py => tests/autopilot/webapp_container/tests/test_chrome.py
- tests/autopilot/webbrowser_app/tests/test_history.py => tests/autopilot/webbrowser_app/tests/test_suggestions.py
- tests/unittests/history-matches-model/ => tests/unittests/suggestions-filter-model/
- tests/unittests/history-matches-model/tst_HistoryMatchesModelTests.cpp => tests/unittests/suggestions-filter-model/tst_SuggestionsFilterModelTests.cpp
- files modified:
- .bzrignore
expand all
collapse all
added
removed
src/app/webbrowser/assets/bottom_edge_hint@27.png
src/app/webbrowser/assets/tab-header-center@27.png
src/app/webbrowser/assets/tab-header-left@27.png
src/app/webbrowser/assets/tab-header-right@27.png
webbrowser-app.png
