← Back to branch summary

~abreu-alexandre/oxide/v8-deprecations

~abreu-alexandre/oxide/v8-deprecations

Viewing all changes in revision 1397.

Committer: Chris Coulson
Date: 2016-03-31 10:14:00 UTC
mfrom: (640.1.513 crmaster)
Revision ID: chris.coulson@canonical.com-20160331101400-f9lfdoazvlvd3394

Merge r1153 from lp:oxide/crmaster

files modified:
checkout.conf

shared/browser/compositor/oxide_compositor.cc

shared/browser/permissions/oxide_permission_manager.cc

shared/browser/permissions/oxide_permission_manager.h

shared/port/ozone/ozone_platform_oxide.cc

Show diffs side-by-side

added added

removed removed

shared/browser/compositor/oxide_compositor.cc

shared/browser/permissions/oxide_permission_manager.cc

shared/browser/permissions/oxide_permission_manager.h

shared/port/ozone/ozone_platform_oxide.cc

Older »