From kde-commits  Sun Jul 31 23:56:07 2011
From: Pierre Ducroquet <pinaraf () pinaraf ! info>
Date: Sun, 31 Jul 2011 23:56:07 +0000
To: kde-commits
Subject: [calligra/words-table-cell-borders] /: Merge remote-tracking branch
Message-Id: <20110731235607.1194EA60BB () git ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=131215661724054

Git commit 4c930ca3a1a6e4b350601b4e4ab5777047a60724 by Pierre Ducroquet.
Committed on 31/07/2011 at 22:01.
Pushed by ducroquet into branch 'words-table-cell-borders'.

Merge remote-tracking branch 'origin/master' into words-table-cell-borders

M  +106  -45   words/part/KWCanvasBase.cpp
M  +1    -1    libs/kotext/styles/KoTableBorderStyle.cpp
M  +1    -0    libs/kotext/KoTextBlockBorderData.cpp
M  +3    -2    libs/kotext/KoTextEditor.cpp
M  +6    -0    libs/textlayout/KoTextLayoutTableArea.cpp

http://commits.kde.org/calligra/4c930ca3a1a6e4b350601b4e4ab5777047a60724