[Kst] [Kst-plot/kst] a16fd2: SVN_SILENT made messages (.desktop file) - always ...

[Peter Kümmel]

  Branch: refs/heads/master
  Home:   https://github.com/Kst-plot/kst
  Commit: a16fd299321c86e03215f150aaa50f845a1fabf0
      https://github.com/Kst-plot/kst/commit/a16fd299321c86e03215f150aaa50f845a1fabf0
  Author: l10n daemon script <scripty at kde.org>
  Date:   2015-08-20 (Thu, 20 Aug 2015)

  Changed paths:
    M src/plugins/dataobject/periodogram/kstplugin_periodogram.desktop
    M src/plugins/dataobject/shift/kstplugin_shift.desktop

  Log Message:
  -----------
  SVN_SILENT made messages (.desktop file) - always resolve ours

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"


  Commit: d9e378371e89dca6f40e445b9204163368279c05
      https://github.com/Kst-plot/kst/commit/d9e378371e89dca6f40e445b9204163368279c05
  Author: Peter Kümmel <syntheticpp at gmx.net>
  Date:   2015-08-20 (Thu, 20 Aug 2015)

  Changed paths:
    M src/libkst/math_kst.h
    M src/libkst/matrix.cpp
    M src/libkst/vector.cpp
    M src/libkstapp/histogramdialog.cpp
    M src/libkstapp/plotaxis.cpp
    M src/libkstmath/curve.cpp
    M src/libkstmath/enodefactory.cpp
    M src/libkstmath/image.cpp
    M src/libkstmath/psd.cpp
    M src/plugins/dataobject/lockin/iirfilter.h

  Log Message:
  -----------
  build with C++11


  Commit: a398baa823e67d797779e0dedbb5ab411b4c8316
      https://github.com/Kst-plot/kst/commit/a398baa823e67d797779e0dedbb5ab411b4c8316
  Author: Peter Kümmel <syntheticpp at gmx.net>
  Date:   2015-08-20 (Thu, 20 Aug 2015)

  Changed paths:
    M .travis.yml
    M CMakeLists.txt
    M cmake/travis.sh

  Log Message:
  -----------
  use Qt 5.5.0 for Windows build


  Commit: b35d42633bde00f5dfe40a97bccd689fa78f51df
      https://github.com/Kst-plot/kst/commit/b35d42633bde00f5dfe40a97bccd689fa78f51df
  Author: Peter Kümmel <syntheticpp at gmx.net>
  Date:   2015-08-20 (Thu, 20 Aug 2015)

  Changed paths:
    M .travis.yml
    M cmake/travis.sh

  Log Message:
  -----------
  use new buildservers


Compare: https://github.com/Kst-plot/kst/compare/1fdaf2e75a07...b35d42633bde