← Back to branch summary

~diegosarmentero/unity8/unity-rates-and-scroll

~diegosarmentero/unity8/unity-rates-and-scroll

Viewing all changes in revision 352.

Committer: Diego Sarmentero
Date: 2013-09-26 18:55:06 UTC
mfrom: (320.3.9 unity8)
Revision ID: diego.sarmentero@gmail.com-20130926185506-dtfv518q159vwu1m

resolve conflict

files modified:
Dash/Apps/AppPreview.qml

Dash/Apps/AppReviews.qml

Dash/DashPreview.qml

tests/qmltests/Dash/Apps/tst_AppPreview.qml

Show diffs side-by-side

added added

removed removed

Dash/Apps/AppPreview.qml

Dash/Apps/AppReviews.qml

Dash/DashPreview.qml

tests/qmltests/Dash/Apps/tst_AppPreview.qml

Older »