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

List:       kde-commits
Subject:    =?utf-8?q?=5Bcalligra/textlayout-anchors-boemann=5D_libs/textlay?=
From:       Casper Boemann <cbo () boemann ! dk>
Date:       2011-04-30 21:06:22
Message-ID: 20110430210622.D6538A60B4 () git ! kde ! org
[Download RAW message or body]

Git commit b82fb845247cdf772e69b36c01bc8e521c247240 by Casper Boemann.
Committed on 30/04/2011 at 23:06.
Pushed by boemann into branch 'textlayout-anchors-boemann'.

Merge branch 'textlayout-anchors-boemann' of git://anongit3.kde.org/calligra into \
textlayout-anchors-boemann

Conflicts:
	libs/textlayout/KoTextDocumentLayout.cpp

I  +1    -1    libs/textlayout/AnchorStrategy.cpp     
MM +4    -2    libs/textlayout/KoTextDocumentLayout.cpp     

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


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