From kde-commits  Sat Oct 31 22:23:13 2015
From: Steve Allewell <steve.allewell () gmail ! com>
Date: Sat, 31 Oct 2015 22:23:13 +0000
To: kde-commits
Subject: [kxstitch] ui: Merge branch 'frameworks'
Message-Id: <E1ZseYL-0003xQ-Db () scm ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=144633020532478

Git commit 3a1809efa3f796fc67d04c88b797bb6dbc81fe66 by Steve Allewell.
Committed on 31/10/2015 at 22:20.
Pushed by sallewell into branch 'master'.

Merge branch 'frameworks'

Conflicts:
	src/LibraryTreeWidget.cpp
	src/Main.cpp
	src/SymbolSelectorDlg.cpp
	ui/PaletteManager.ui

M  +11   -0    ui/PaletteManager.ui

http://commits.kde.org/kxstitch/3a1809efa3f796fc67d04c88b797bb6dbc81fe66

diff --cc ui/PaletteManager.ui
index 38f0d29,5d5c7a5..799f990
--- a/ui/PaletteManager.ui
+++ b/ui/PaletteManager.ui
@@@ -23,6 -23,6 +23,10 @@@
         </property>
        </widget>
       </item>
++    </layout>
++   </item>
++   <item row=3D"0" column=3D"6" colspan=3D"2">
++    <layout class=3D"QHBoxLayout" name=3D"horizontalLayout">
       <item>
        <widget class=3D"QListWidget" name=3D"CurrentList"/>
       </item>