« back to all changes in this revision
Viewing changes to src/app/webbrowser/assets/tab-active@27.png
- Committer: Olivier Tilloy
- Date: 2015-09-23 18:43:10 UTC
- mfrom: (1131.26.14 webbrowser-app)
- Revision ID: olivier.tilloy@canonical.com-20150923184310-hyff8vgwcyurj2tv
Merge the latest changes from trunk and resolve a conflict.
- files added:
- src/app/webbrowser/Highlight.js
- files removed:
- src/app/webbrowser/assets/tab-active-center@18.png
- files renamed:
- src/app/actions/ShareLink.qml => src/app/actions/Share.qml
- src/app/webbrowser/suggestions-filter-model.cpp => src/app/webbrowser/text-search-filter-model.cpp
- src/app/webbrowser/suggestions-filter-model.h => src/app/webbrowser/text-search-filter-model.h
- tests/unittests/suggestions-filter-model/ => tests/unittests/text-search-filter-model/
- tests/unittests/suggestions-filter-model/tst_SuggestionsFilterModelTests.cpp => tests/unittests/text-search-filter-model/tst_TextSearchFilterModelTests.cpp
- files modified:
- CMakeLists.txt
added
removed
src/app/webbrowser/assets/tab-active@27.png
