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

List:       kde-commits
Subject:    [calligra/textshape-stylesWidget-PierreSt] plugins/textshape: Merge branch 'master' into textshape-s
From:       Pierre Stirnweiss <pstirnweiss () googlemail ! com>
Date:       2013-02-03 21:41:39
Message-ID: 20130203214139.37E8DA60EB () git ! kde ! org
[Download RAW message or body]

Git commit beadaa582e6cbcc291cd9451ff011c2486a0ffe2 by Pierre Stirnweiss.
Committed on 22/01/2013 at 17:57.
Pushed by pstirnweiss into branch 'textshape-stylesWidget-PierreSt'.

Merge branch 'master' into textshape-stylesWidget-PierreSt

Conflicts:
	libs/kotext/KoTextEditor_format.cpp
	plugins/textshape/dialogs/DockerStylesComboModel.cpp

M  +18   -0    plugins/textshape/CMakeLists.txt
M  +2    -2    plugins/textshape/TextTool.cpp
M  +2    -2    plugins/textshape/dialogs/StyleManager.cpp

http://commits.kde.org/calligra/beadaa582e6cbcc291cd9451ff011c2486a0ffe2


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