[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kxstitch] ui: Merge branch 'frameworks'
From:       Steve Allewell <steve.allewell () gmail ! com>
Date:       2015-10-31 22:23:13
Message-ID: E1ZseYL-0003xQ-Db () scm ! kde ! org
[Download RAW message or body]

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="0" column="6" colspan="2">
++    <layout class="QHBoxLayout" name="horizontalLayout">
       <item>
        <widget class="QListWidget" name="CurrentList"/>
       </item>
[prev in list] [next in list] [prev in thread] [next in thread]