Viewing all changes in revision 1028.
- Committer: Olivier Tilloy
- Date: 2015-06-15 14:13:07 UTC
- mfrom: (1022.1.110 oxide)
- Revision ID: olivier.tilloy@canonical.com-20150615141307-db9q44mc5wduuot0
Merge the latest changes from trunk and resolve a conflict.
- shared/browser/permissions
- qt/core/common
- files renamed:
- qt/core/api/oxideqmediacapturedevice.cc => qt/core/api/oxideqmediacapturedevices.cc
- qt/core/api/oxideqmediacapturedevice.h => qt/core/api/oxideqmediacapturedevices.h
- qt/core/common/oxide_qt_event_utils.cc => qt/core/browser/oxide_qt_event_utils.cc
- qt/core/common/oxide_qt_event_utils.h => qt/core/browser/oxide_qt_event_utils.h
- qt/core/common/oxide_qt_screen_utils.cc => qt/core/browser/oxide_qt_screen_utils.cc
- qt/core/common/oxide_qt_screen_utils.h => qt/core/browser/oxide_qt_screen_utils.h
- qt/core/common/oxide_qt_skutils.cc => qt/core/browser/oxide_qt_skutils.cc
- qt/core/common/oxide_qt_skutils.h => qt/core/browser/oxide_qt_skutils.h
- shared/common/oxide_event_utils.cc => shared/browser/oxide_event_utils.cc
- shared/common/oxide_event_utils.h => shared/browser/oxide_event_utils.h
- shared/browser/oxide_permission_manager.cc => shared/browser/permissions/oxide_permission_manager.cc
- shared/browser/oxide_permission_manager.h => shared/browser/permissions/oxide_permission_manager.h
- shared/browser/oxide_permission_request.cc => shared/browser/permissions/oxide_permission_request.cc
- shared/browser/oxide_permission_request.h => shared/browser/permissions/oxide_permission_request.h
- files modified:
- CHROMIUM_VERSION
expand all
collapse all
added
removed
