lp://staging/~tpeeters/ubuntu-ui-toolkit/optIn-newHeader

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp://staging/ubuntu-ui-toolkit at revision 988

PS Jenkins bot: Approve (continuous-integration) on 2014-03-26

Zsombor Egri: Approve on 2014-03-10

Diff: 304 lines (+45/-83)

5 files modified

components.api (+1/-0)
modules/Ubuntu/Components/MainView.qml (+42/-16)
modules/Ubuntu/Components/Toolbar.qml (+1/-1)
tests/unit/tst_components/tst_toolbaritems.qml (+1/-2)
tests/unit_x11/tst_inversemousearea/InverseMouseAreaInListView.qml (+0/-64)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1273184: Remove toolbar

Critical

Fix Released

Link a bug report

Related blueprints

949. By Tim Peeters on 2014-03-26

merge translations from trunk

948. By Tim Peeters on 2014-03-24

re-adding InverseMouseAreaInListView.qml which got lost in the previous trunk merge

947. By Tim Peeters on 2014-03-24

merge trunk

946. By Tim Peeters on 2014-03-18

CI jobs fixed. retry

945. By Tim Peeters on 2014-03-18

retry

944. By Tim Peeters on 2014-03-18

revert ima-bug1288876 merge

943. By Tim Peeters on 2014-03-17

merge ima-bug1288876. See if jenkins CI passes now.

942. By Tim Peeters on 2014-03-17

merge trunk

941. By Tim Peeters on 2014-03-17

merge trunk

940. By Tim Peeters on 2014-03-14

merge trunk