[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [calligra/words-newsectionmodel-deniskup] /: Merge branch 'frameworks' into words-newsectionmodel-de
From: Denis Kuplyakov <dener.kup () gmail ! com>
Date: 2015-08-06 17:08:31
Message-ID: E1ZNOed-0006Vb-H1 () scm ! kde ! org
[Download RAW message or body]
Git commit c68e99610bf66cf101a21cb36cfb6bb1501fc4a2 by Denis Kuplyakov.
Committed on 06/08/2015 at 17:07.
Pushed by deniskuplyakov into branch 'words-newsectionmodel-deniskup'.
Merge branch 'frameworks' into words-newsectionmodel-deniskup
Conflicts:
libs/kotext/KoTextEditor.cpp
Copyright changes conflict.
M +7 -1 libs/kotext/KoTextEditor.cpp
M +17 -0 plugins/textshape/TextTool.cpp
http://commits.kde.org/calligra/c68e99610bf66cf101a21cb36cfb6bb1501fc4a2
diff --cc libs/kotext/KoTextEditor.cpp
index 912d6aa,1b81e3a..f2bd756
--- a/libs/kotext/KoTextEditor.cpp
+++ b/libs/kotext/KoTextEditor.cpp
@@@ -2,8 -2,9 +2,9 @@@
* Copyright (C) 2009-2012 Pierre Stirnweiss <pstirnweiss@googlemail.com>
* Copyright (C) 2006-2010 Thomas Zander <zander@kde.org>
* Copyright (c) 2011 Boudewijn Rempt <boud@kogmbh.com>
- * Copyright (C) 2011-2012 C. Boemann <cbo@boemann.dk>
+ * Copyright (C) 2011-2015 C. Boemann <cbo@boemann.dk>
- * Copyright (C) 2014 Denis Kuplyakov <dener.kup@gmail.com>
+ * Copyright (C) 2014-2015 Denis Kuplyakov <dener.kup@gmail.com>
+ * Copyright (C) 2015 Soma Schliszka <soma.schliszka@gmail.com>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic