Merge changes from topic 'merge-statusbar-into-toolbar'
commita3bee43484a88f38330c0996eb3cf159bbf1cedf
authorJan Kundrát <jkt@kde.org>
Fri, 29 Jan 2016 11:39:06 +0000 (29 12:39 +0100)
committerGerrit Code Review <noreply@kde.org>
Fri, 29 Jan 2016 11:39:06 +0000 (29 12:39 +0100)
treeaf637faeecabebcb7286ec101cc9dc058611b081
parentf7d1ecb05347c524d97e194fd9fc56a78a496449
parent6aeb9cfdf4f3aea1386916dba3f91a00a18a9dc4
Merge changes from topic 'merge-statusbar-into-toolbar'

* changes:
  GUI: Move the mainmenu-through-toolbar button to the right/bottom edge
  GUI: Remove the "Settings..." button from the main toolbar
  GUI: Merge the main menu into the main toolbar