← Back to branch summary

~osomon/webbrowser-app/copy-image-to-clipboard

~osomon/webbrowser-app/copy-image-to-clipboard

Viewing all changes in revision 1469.

Committer: Olivier Tilloy
Date: 2016-06-17 19:25:12 UTC
mfrom: (1465.1.21 webbrowser-app)
Revision ID: olivier.tilloy@canonical.com-20160617192512-i36qfseab3x37n5b

Merge latest changes from trunk and resolve minor conflicts.

files modified:
cmake/qt5.cmake

cmake/ubuntu-arm-linux-gnueabihf.cmake

debian/changelog

debian/control

doc/CMakeLists.txt

po/aa.po

po/am.po

po/ar.po

po/ast.po

po/az.po

po/be.po

po/bg.po

po/bn.po

po/br.po

po/bs.po

po/ca.po

po/ca@valencia.po

po/cs.po

po/cy.po

po/da.po

po/de.po

po/el.po

po/en_AU.po

po/en_GB.po

po/eo.po

po/es.po

po/et.po

po/eu.po

po/fa.po

po/fi.po

po/fr.po

po/fr_CA.po

po/ga.po

po/gd.po

po/gl.po

po/he.po

po/hi.po

po/hr.po

po/hu.po

po/hy.po

po/ia.po

po/id.po

po/is.po

po/it.po

po/ja.po

po/km.po

po/kn.po

po/ko.po

po/lo.po

po/lt.po

po/lv.po

po/ml.po

po/mr.po

po/ms.po

po/my.po

po/nb.po

po/ne.po

po/nl.po

po/oc.po

po/pa.po

po/pl.po

po/pt.po

po/pt_BR.po

po/ro.po

po/ru.po

po/sa.po

po/sco.po

po/shn.po

po/si.po

po/sk.po

po/sl.po

po/sq.po

po/sr.po

po/sv.po

po/ta.po

po/te.po

po/th.po

po/tr.po

po/ug.po

po/uk.po

po/uz.po

po/vi.po

po/webbrowser-app.pot

po/zh_CN.po

po/zh_HK.po

po/zh_TW.po

src/Ubuntu/Web/UbuntuWebView02.qml

src/Ubuntu/Web/UserAgent02.qml

src/Ubuntu/Web/ua-overrides-mobile.js

src/app/Favicon.qml

src/app/browserapplication.cpp

src/app/browserapplication.h

src/app/config.h.in

src/app/favicon-fetcher.cpp

src/app/favicon-fetcher.h

src/app/single-instance-manager.cpp

src/app/single-instance-manager.h

src/app/webbrowser/BookmarksFoldersView.qml

src/app/webbrowser/BookmarksFoldersViewWide.qml

src/app/webbrowser/BookmarksView.qml

src/app/webbrowser/BookmarksViewWide.qml

src/app/webbrowser/Browser.qml

src/app/webbrowser/DownloadsPage.qml

src/app/webbrowser/ExpandedHistoryView.qml

src/app/webbrowser/HistoryView.qml

src/app/webbrowser/HistoryViewWide.qml

src/app/webbrowser/NewTabView.qml

src/app/webbrowser/UrlPreviewDelegate.qml

src/app/webbrowser/webbrowser-app.cpp

src/app/webcontainer/AccountsLogic.qml

src/app/webcontainer/webapp-container.cpp

src/app/webcontainer/webapp-container.h

tests/autopilot/webapp_container/tests/__init__.py

tests/autopilot/webbrowser_app/tests/test_keyboard.py

tests/autopilot/webbrowser_app/tests/test_touchselection.py

tests/unittests/favicon-fetcher/tst_FaviconFetcherTests.cpp

tests/unittests/single-instance-manager/tst_SingleInstanceManagerTests.cpp

Show diffs side-by-side

added added

removed removed

cmake/qt5.cmake

cmake/ubuntu-arm-linux-gnueabihf.cmake

debian/changelog

doc/CMakeLists.txt

po/ca@valencia.po

po/webbrowser-app.pot

src/Ubuntu/Web/UbuntuWebView02.qml

src/Ubuntu/Web/UserAgent02.qml

src/Ubuntu/Web/ua-overrides-mobile.js

src/app/Favicon.qml

src/app/browserapplication.cpp

src/app/browserapplication.h

src/app/config.h.in

src/app/favicon-fetcher.cpp

src/app/favicon-fetcher.h

src/app/single-instance-manager.cpp

src/app/single-instance-manager.h

src/app/webbrowser/BookmarksFoldersView.qml

src/app/webbrowser/BookmarksFoldersViewWide.qml

src/app/webbrowser/BookmarksView.qml

src/app/webbrowser/BookmarksViewWide.qml

src/app/webbrowser/Browser.qml

src/app/webbrowser/DownloadsPage.qml

src/app/webbrowser/ExpandedHistoryView.qml

src/app/webbrowser/HistoryView.qml

src/app/webbrowser/HistoryViewWide.qml

src/app/webbrowser/NewTabView.qml

src/app/webbrowser/UrlPreviewDelegate.qml

src/app/webbrowser/webbrowser-app.cpp

src/app/webcontainer/AccountsLogic.qml

src/app/webcontainer/webapp-container.cpp

src/app/webcontainer/webapp-container.h

tests/autopilot/webapp_container/tests/__init__.py

tests/autopilot/webbrowser_app/tests/test_keyboard.py

tests/autopilot/webbrowser_app/tests/test_touchselection.py

tests/unittests/favicon-fetcher/tst_FaviconFetcherTests.cpp

tests/unittests/single-instance-manager/tst_SingleInstanceManagerTests.cpp

Older »