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

List:       kde-commits
Subject:    =?utf-8?q?=5Bkoffice/change-tracking-integration=5D_plugins/text?=
From:       Ganesh Paramasivam <ganesh () crystalfab ! com>
Date:       2011-02-23 15:15:50
Message-ID: 20110223151550.5E796A60A9 () git ! kde ! org
[Download RAW message or body]

Git commit 204da025752cd06dbd0f2cccec919dac854841ca by Ganesh Paramasivam.
Committed on 23/02/2011 at 16:15.
Pushed by ganeshp into branch 'change-tracking-integration'.

Fixing more merge issues

I  +11   -0    kword/part/dialogs/KWFrameRunaroundProperties.cpp     
I  +4    -4    kword/part/frames/KWFrameLayout.cpp     
I  +3    -1    libs/flake/KoShape.cpp     
I  +12   -2    libs/kotext/KoTextDocumentLayout.cpp     
I  +1    -0    libs/kotext/styles/KoParagraphStyle.cpp     
I  +1    -1    plugins/textshape/Layout.cpp     
MM +6    -3    plugins/textshape/TextTool.cpp     
I  +3    -1    plugins/textshape/dialogs/NewStyleWidget.cpp     
I  +2    -1    plugins/textshape/dialogs/NewStyleWidget.h     
I  +108  -100  plugins/textshape/dialogs/NewStyleWidget.ui     
I  +53   -12   plugins/textshape/dialogs/StyleManager.cpp     
I  +1    -0    plugins/textshape/dialogs/StyleManager.h     
I  +1    -0    plugins/textshape/dialogs/StylesWidget.cpp     

http://commits.kde.org/koffice/204da025752cd06dbd0f2cccec919dac854841ca

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