← Back to branch summary

~osomon/oxide/touch-selection-api

~osomon/oxide/touch-selection-api

Viewing all changes in revision 1310.

Committer: Olivier Tilloy
Date: 2016-01-12 11:45:54 UTC
mfrom: (1272.1.36 oxide)
Revision ID: olivier.tilloy@canonical.com-20160112114554-kt57hdrqixa2zqy4

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

files renamed:
shared/browser/oxide_android_properties.cc => shared/browser/oxide_hybris_utils.cc

shared/browser/oxide_android_properties.h => shared/browser/oxide_hybris_utils.h

files modified:
build/tools/release.py

qt/qmlplugin/CMakeLists.txt

qt/qmlplugin/oxide.qmltypes

qt/qmlplugin/oxide_qml_plugin.cc

qt/quick/api/oxideqquickwebview_p.h

shared/browser/media/oxide_video_capture_device_factory_linux.cc

shared/browser/media/oxide_video_capture_device_hybris.cc

shared/browser/oxide_browser_process_main.cc

shared/browser/oxide_content_browser_client.cc

shared/browser/oxide_form_factor_detection_linux.cc

shared/browser/oxide_gpu_info_collector_linux.cc

shared/shared.gyp

Show diffs side-by-side

added added

removed removed

build/tools/release.py

qt/qmlplugin/CMakeLists.txt

qt/qmlplugin/oxide.qmltypes

qt/qmlplugin/oxide_qml_plugin.cc

qt/quick/api/oxideqquickwebview_p.h

shared/browser/media/oxide_video_capture_device_factory_linux.cc

shared/browser/media/oxide_video_capture_device_hybris.cc

shared/browser/oxide_browser_process_main.cc

shared/browser/oxide_content_browser_client.cc

shared/browser/oxide_form_factor_detection_linux.cc

shared/browser/oxide_gpu_info_collector_linux.cc

shared/browser/oxide_hybris_utils.cc

shared/browser/oxide_hybris_utils.h

shared/shared.gyp

Older »