← Back to branch summary

~osomon/webbrowser-app/bottom-edge-mouse

~osomon/webbrowser-app/bottom-edge-mouse

Viewing all changes in revision 1334.

Committer: Olivier Tilloy
Date: 2016-01-28 18:54:35 UTC
mfrom: (1328.1.7 webbrowser-app)
Revision ID: olivier.tilloy@canonical.com-20160128185435-ry7qkjmegp8nm6fz

Merge the latest changes from trunk, and resolve a minor conflict.

files added:
src/app/single-instance-manager.cpp

src/app/single-instance-manager.h

tests/unittests/single-instance-manager

tests/unittests/single-instance-manager/CMakeLists.txt

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

files modified:
debian/changelog

po/sr.po

src/app/BrowserWindow.qml

src/app/CMakeLists.txt

src/app/browserapplication.cpp

src/app/browserapplication.h

src/app/webbrowser/BookmarksFoldersViewWide.qml

src/app/webbrowser/Browser.qml

src/app/webbrowser/webbrowser-app.h

src/app/webbrowser/webbrowser-app.qml

src/app/webcontainer/webapp-container.cpp

src/app/webcontainer/webapp-container.qml

tests/autopilot/webapp_container/tests/__init__.py

tests/autopilot/webbrowser_app/tests/__init__.py

tests/autopilot/webbrowser_app/tests/test_keyboard.py

tests/autopilot/webbrowser_app/tests/test_new_tab_view.py

tests/autopilot/webbrowser_app/tests/test_private.py

tests/autopilot/webbrowser_app/tests/test_sad_tab.py

tests/autopilot/webbrowser_app/tests/test_tabs.py

tests/unittests/CMakeLists.txt

Show diffs side-by-side

added added

removed removed

debian/changelog

src/app/BrowserWindow.qml

src/app/CMakeLists.txt

src/app/browserapplication.cpp

src/app/browserapplication.h

src/app/single-instance-manager.cpp

src/app/single-instance-manager.h

src/app/webbrowser/BookmarksFoldersViewWide.qml

src/app/webbrowser/Browser.qml

src/app/webbrowser/webbrowser-app.h

src/app/webbrowser/webbrowser-app.qml

src/app/webcontainer/webapp-container.cpp

src/app/webcontainer/webapp-container.qml

tests/autopilot/webapp_container/tests/__init__.py

tests/autopilot/webbrowser_app/tests/__init__.py

tests/autopilot/webbrowser_app/tests/test_keyboard.py

tests/autopilot/webbrowser_app/tests/test_new_tab_view.py

tests/autopilot/webbrowser_app/tests/test_private.py

tests/autopilot/webbrowser_app/tests/test_sad_tab.py

tests/autopilot/webbrowser_app/tests/test_tabs.py

tests/unittests/CMakeLists.txt

tests/unittests/single-instance-manager/

tests/unittests/single-instance-manager/CMakeLists.txt

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

Older »