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

List:       kde-commits
Subject:    [calligra/filters-charting-ingwa] /: Merge branch 'master' into filters-charting-ingwa
From:       Inge Wallin <inge () lysator ! liu ! se>
Date:       2015-03-02 13:12:11
Message-ID: E1YSQ8p-0002N4-Hf () scm ! kde ! org
[Download RAW message or body]

Git commit 67ee01b08ad65cd085e5edde7a0ef14a9e001339 by Inge Wallin.
Committed on 02/03/2015 at 12:13.
Pushed by ingwa into branch 'filters-charting-ingwa'.

Merge branch 'master' into filters-charting-ingwa

M  +14   -4    CMakeLists.txt
M  +2    -0    filters/libodf2/CMakeLists.txt
M  +1    -1    filters/stage/pptx/CMakeLists.txt
M  +1    -1    filters/words/docx/import/CMakeLists.txt
M  +1    -1    filters/words/msword-odf/CMakeLists.txt

http://commits.kde.org/calligra/67ee01b08ad65cd085e5edde7a0ef14a9e001339

diff --cc filters/libodf2/CMakeLists.txt
index b3956ea,0006016..0a4ae56
--- a/filters/libodf2/CMakeLists.txt
+++ b/filters/libodf2/CMakeLists.txt
@@@ -13,8 -5,9 +13,10 @@@ include_directories(${KOODF_INCLUDES
  ########### libkoodf2 ###############
  =

  set(koodf2_LIB_SRCS
 +    # Storage objects, using old DOM based loading
      KoXmlStreamReader.cpp
+     KoXmlUtils.cpp
+ =

      KoTable.cpp
      KoRow.cpp
      KoColumn.cpp
[prev in list] [next in list] [prev in thread] [next in thread]