← Back to branch summary

~phablet-team/+junk/filters-ui

~phablet-team/+junk/filters-ui

Viewing all changes in revision 188.

Committer: Ugo Riboni
Date: 2015-03-23 11:57:59 UTC
mfrom: (176.1.81 trunk)
Revision ID: ugo.riboni@canonical.com-20150323115759-0e38rbnqu1aqr7h9

Merge upstream

files modified:
app/EffectsGrid.qml

backend/modules/Filters/halide_function.cpp

backend/modules/Filters/halide_image.cpp

backend/modules/Filters/halide_transform_renderer.cpp

Show diffs side-by-side

added added

removed removed

app/EffectsGrid.qml

backend/modules/Filters/halide_function.cpp

backend/modules/Filters/halide_image.cpp

backend/modules/Filters/halide_transform_renderer.cpp

Older »