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

List:       kde-commits
Subject:    [calligra] /: Merge branch 'calligra/2.9'
From:       Inge Wallin <inge () lysator ! liu ! se>
Date:       2015-02-03 22:14:31
Message-ID: E1YIljr-0008E3-Nf () scm ! kde ! org
[Download RAW message or body]

Git commit 55d9e167da95a6aeb62b42c7101c02b2c952f77f by Inge Wallin.
Committed on 03/02/2015 at 21:49.
Pushed by ingwa into branch 'master'.

Merge branch 'calligra/2.9'

Conflicts:
	krita/integration/thumbnail/kritaanimation_kranim_thumbnail.desktop
	krita/plugins/extensions/dockers/animator/krita_animator.desktop
	krita/plugins/formats/kranimseq/kranimseq_export.desktop

M  +84   -83   kexi/plugins/tables/kexitabledesignerview.cpp
M  +1    -1    krita/krita.desktop
M  +7    -2    libs/kotext/commands/DeleteCommand.cpp

http://commits.kde.org/calligra/55d9e167da95a6aeb62b42c7101c02b2c952f77f
[prev in list] [next in list] [prev in thread] [next in thread]