[SCM] kte-collaborative packaging branch, master, updated. upstream/0.2.0-30-g42286ea

[Diane Trout]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kde-telepathy/kte-collaborative.git;a=commitdiff;h=8894276

The following commit has been merged in the master branch:
commit 8894276543e33b4650272f8535c09cf9348814a9
Merge: 1ad59ee3f791c2840c627f81f13042a1bea1f4f5 e9ff2d56e0e465fd61071eb3e1256e3c635dba4e
Author: Diane Trout <diane at ghic.org>
Date:   Tue Jun 30 21:12:04 2015 -0700

    Merge tag 'upstream/0.2.0+git20150403'
    
    Upstream version 0.2.0+git20150403

 .gitignore                                         |  27 +
 CMakeLists.txt                                     |   6 +-
 CMakeModules/FindLibinfinity.cmake                 |   6 +-
 CMakeModules/FindLibinftext.cmake                  |   6 +-
 common/CMakeLists.txt                              |   8 -
 common/document.cpp                                |  57 +-
 common/document.h                                  |   4 +-
 common/noteplugin.cpp                              |  14 +-
 common/noteplugin.h                                |  10 +-
 docs/.gitignore                                    |   2 +
 kioslave/infinity.protocol                         |   2 +
 kioslave/kio_infinity.cpp                          |  28 +-
 kte-plugin/.gitignore                              |   7 +
 kte-plugin/ktecollaborativeplugin.cpp              |   4 +-
 kte-plugin/ktecollaborativepluginview.cpp          |  35 +-
 kte-plugin/ktexteditor_collaborative.desktop       |  17 +-
 kte-plugin/ktpintegration/CMakeLists.txt           |   4 +-
 .../ktpintegration/ktp_kte-collaborative.desktop   |   9 +-
 kte-plugin/manageddocument.cpp                     |  14 +-
 kte-plugin/manageddocument.h                       |   6 +
 .../ktexteditor_collaborative_config.desktop       |   5 +-
 notifier-module/infinotenotifier.cpp               |   4 +-
 notifier-module/infinotenotifier.notifyrc          |  32 +
 po/CMakeLists.txt                                  |  26 -
 po/bs/CMakeLists.txt                               |   2 -
 po/bs/kte-collaborative.po                         | 679 ---------------------
 po/cs/CMakeLists.txt                               |   2 -
 po/cs/kte-collaborative.po                         | 595 ------------------
 po/de/CMakeLists.txt                               |   2 -
 po/de/kte-collaborative.po                         | 615 -------------------
 po/fr/CMakeLists.txt                               |   2 -
 po/fr/kte-collaborative.po                         | 612 -------------------
 po/hu/CMakeLists.txt                               |   2 -
 po/hu/kte-collaborative.po                         | 631 -------------------
 po/nl/CMakeLists.txt                               |   2 -
 po/nl/kte-collaborative.po                         | 631 -------------------
 po/pl/CMakeLists.txt                               |   2 -
 po/pl/kte-collaborative.po                         | 629 -------------------
 po/pt/CMakeLists.txt                               |   2 -
 po/pt/kte-collaborative.po                         | 639 -------------------
 po/pt_BR/CMakeLists.txt                            |   2 -
 po/pt_BR/kte-collaborative.po                      | 637 -------------------
 po/sk/CMakeLists.txt                               |   2 -
 po/sk/kte-collaborative.po                         | 593 ------------------
 po/sv/CMakeLists.txt                               |   2 -
 po/sv/kte-collaborative.po                         | 626 -------------------
 po/ug/CMakeLists.txt                               |   2 -
 po/ug/kte-collaborative.po                         | 599 ------------------
 po/uk/CMakeLists.txt                               |   2 -
 po/uk/kte-collaborative.po                         | 635 -------------------
 tests/CMakeLists.txt                               |   1 +
 tests/collaborativeeditingtest.cpp                 |   3 +-
 52 files changed, 221 insertions(+), 8263 deletions(-)

-- 
kte-collaborative packaging