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

[Barth Netterfield]

  Branch: refs/heads/master
  Home:   https://github.com/Kst-plot/kst
  Commit: 779ab5e1632335bf12f3ceb6a738dbe581af2a5a
      https://github.com/Kst-plot/kst/commit/779ab5e1632335bf12f3ceb6a738dbe581af2a5a
  Author: l10n daemon script <scripty at kde.org>
  Date:   2017-03-16 (Thu, 16 Mar 2017)

  Changed paths:
    M src/plugins/dataobject/effectivebandwidth/kstplugin_effectivebandwidth.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: 43e3354e593604911d6360a34114908ab9096178
      https://github.com/Kst-plot/kst/commit/43e3354e593604911d6360a34114908ab9096178
  Author: Yuri Chornoivan <yurchor at ukr.net>
  Date:   2017-03-26 (Sun, 26 Mar 2017)

  Changed paths:
    M devel-docs/doxygen/Doxyfile.doxy
    M docbook/kst/tutorial.docbook
    M old_datasources/healpix/healpix_tools_pix.cpp
    M pyKst/pykst.py

  Log Message:
  -----------
  Fix minor typos


  Commit: 318bfc39cc73ac93100a707e5f713466e4661ae0
      https://github.com/Kst-plot/kst/commit/318bfc39cc73ac93100a707e5f713466e4661ae0
  Author: Pino Toscano <pino at kde.org>
  Date:   2017-04-12 (Wed, 12 Apr 2017)

  Changed paths:
    R kst.lsm.in

  Log Message:
  -----------
  remove obsolete LSM file


  Commit: c0b2a413c5359f22f754d667e2cc5576791c9efa
      https://github.com/Kst-plot/kst/commit/c0b2a413c5359f22f754d667e2cc5576791c9efa
  Author: Barth Netterfield <netterfield at astro.utoronto.ca>
  Date:   2017-04-18 (Tue, 18 Apr 2017)

  Changed paths:
    M src/libkstapp/exportgraphicsdialog.cpp
    M src/libkstapp/exportgraphicsdialog.h

  Log Message:
  -----------
  Remove code commented-out code in the last commit.


  Commit: d246b89e0f882b0fcaa9e7d89a16fce7d032aba7
      https://github.com/Kst-plot/kst/commit/d246b89e0f882b0fcaa9e7d89a16fce7d032aba7
  Author: Barth Netterfield <netterfield at astro.utoronto.ca>
  Date:   2017-04-18 (Tue, 18 Apr 2017)

  Changed paths:
    M src/datasources/ascii/asciiconfigwidget.cpp
    M src/datasources/ascii/asciiplugin.cpp

  Log Message:
  -----------
  Remove UI for 'Always accept files matching"

This feature, in the ascii dialog is
i) very confusing
ii) as far as I can tell, useless
So, this patch hides it.


  Commit: 071a4254c9e21b9028071a5a093054b9b52de564
      https://github.com/Kst-plot/kst/commit/071a4254c9e21b9028071a5a093054b9b52de564
  Author: Barth Netterfield <netterfield at astro.utoronto.ca>
  Date:   2017-04-18 (Tue, 18 Apr 2017)

  Changed paths:
    R src/datasources/bis/moc_bisdatasource.cxx_parameters
    M src/libkst/datasource.cpp
    M src/libkstapp/datamanager.cpp
    M src/libkstapp/sessionmodel.cpp
    M src/libkstapp/sessionmodel.h

  Log Message:
  -----------
  Now the data manager handles data sources also.

This displays datasourses, and enables delete for datasources.


  Commit: 64d244924046ba94f40f03454a1a913bf010f351
      https://github.com/Kst-plot/kst/commit/64d244924046ba94f40f03454a1a913bf010f351
  Author: Barth Netterfield <netterfield at astro.utoronto.ca>
  Date:   2017-04-18 (Tue, 18 Apr 2017)

  Changed paths:
    M src/libkstapp/baddatasourcedialog.cpp
    M src/libkstapp/changefiledialog.cpp
    A src/libkstapp/datasourceconfiguredialog.cpp
    A src/libkstapp/datasourceconfiguredialog.h
    R src/libkstapp/datasourcedialog.cpp
    R src/libkstapp/datasourcedialog.h
    M src/libkstapp/datawizard.cpp
    M src/libkstapp/matrixdialog.cpp
    M src/libkstapp/scalardialog.cpp
    M src/libkstapp/stringdialog.cpp
    M src/libkstapp/vectordialog.cpp

  Log Message:
  -----------
  rename datasourcedialog to datasourceconfiguredialog.


  Commit: 8bb360c1af5258037e78a4fb3df44fa813194760
      https://github.com/Kst-plot/kst/commit/8bb360c1af5258037e78a4fb3df44fa813194760
  Author: Barth Netterfield <netterfield at astro.utoronto.ca>
  Date:   2017-04-18 (Tue, 18 Apr 2017)

  Changed paths:
    A src/libkstapp/datasourcedialog.cpp
    A src/libkstapp/datasourcedialog.h
    A src/libkstapp/datasourcedialog.ui
    M src/libkstapp/dialoglaunchergui.cpp
    M src/libkstapp/dialoglaunchergui.h
    M src/libkstmath/dialoglauncher.cpp
    M src/libkstmath/dialoglauncher.h

  Log Message:
  -----------
  Edit datasource configuration from the datamanager


  Commit: 616df7dfaa6e35577a9e1ba1f69402975c74f1f2
      https://github.com/Kst-plot/kst/commit/616df7dfaa6e35577a9e1ba1f69402975c74f1f2
  Author: Barth Netterfield <netterfield at astro.utoronto.ca>
  Date:   2017-04-18 (Tue, 18 Apr 2017)

  Changed paths:
    M src/datasources/dirfilesource/dirfilesource.cpp

  Log Message:
  -----------
  Indirect file names for dirfiles are not infinitely long.

Don't crash.


  Commit: 37305b973e983c34ea570f8e9c63ca9358d34d58
      https://github.com/Kst-plot/kst/commit/37305b973e983c34ea570f8e9c63ca9358d34d58
  Author: Barth Netterfield <netterfield at astro.utoronto.ca>
  Date:   2017-04-18 (Tue, 18 Apr 2017)

  Changed paths:
    M docbook/kst/Icon-kst-datamanager.png
    M docbook/kst/Screenshot-kst-datamanager.png
    M docbook/kst/data-chapter.docbook
    M src/libkstapp/commandlineparser.cpp

  Log Message:
  -----------
  Fix -x from different file than -y

BUG: 378403


  Commit: 348a560290a4d8bde39c0ed283df10047927cf07
      https://github.com/Kst-plot/kst/commit/348a560290a4d8bde39c0ed283df10047927cf07
  Author: Barth Netterfield <netterfield at astro.utoronto.ca>
  Date:   2017-04-18 (Tue, 18 Apr 2017)

  Changed paths:
    M src/libkstapp/datasourcedialog.cpp
    M src/libkstapp/datasourcedialog.h

  Log Message:
  -----------
  Add license to new files.


Compare: https://github.com/Kst-plot/kst/compare/79ab4af35f8c...348a560290a4