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

[Barth Netterfield]

Branch: refs/heads/master
Home: https://github.com/Kst-plot/kst
Commit: cad185ad48ebb247623fbc426fe7f5d2593128ee
https://github.com/Kst-plot/kst/commit/cad185ad48ebb247623fbc426fe7f5d2593128ee
Author: l10n daemon script <***@kde.org>
Date: 2017-02-20 (Mon, 20 Feb 2017)

Changed paths:
M src/datasources/netcdf/kstdata_netcdf.desktop
M src/plugins/dataobject/genericfilter/kstplugin_genericfilter.desktop
M src/plugins/filters/despike/kstplugin_filter_despike.desktop
M src/plugins/filters/flag/kstplugin_filter_flag.desktop
M src/plugins/filters/window/kstplugin_filter_window.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: bf249d7664282abe5d8d85e692df8789cea894a2
https://github.com/Kst-plot/kst/commit/bf249d7664282abe5d8d85e692df8789cea894a2
Author: Barth Netterfield <***@astro.utoronto.ca>
Date: 2017-03-02 (Thu, 02 Mar 2017)

Changed paths:
M src/libkstmath/equation.cpp

Log Message:
-----------
Fix interpolate option in equations.


Commit: 1ef8218cd1909a60a3cd3e5a88836e03cf689c07
https://github.com/Kst-plot/kst/commit/1ef8218cd1909a60a3cd3e5a88836e03cf689c07
Author: Barth Netterfield <***@astro.utoronto.ca>
Date: 2017-03-02 (Thu, 02 Mar 2017)

Changed paths:
M pyKst/pykst.py
M src/libkstmath/dataobjectscriptinterface.cpp
M src/libkstmath/dataobjectscriptinterface.h
M src/libkstmath/equation.h

Log Message:
-----------
PyKst can now set equation "interpolate vectors"


Commit: bbcdb67a6e2583830b6e63f29f4855ef4a28a4ab
https://github.com/Kst-plot/kst/commit/bbcdb67a6e2583830b6e63f29f4855ef4a28a4ab
Author: Barth Netterfield <***@astro.utoronto.ca>
Date: 2017-03-02 (Thu, 02 Mar 2017)

Changed paths:
M docbook/kst/Diagram-kst-frames.png
M docbook/kst/additionalformats-chapter.docbook
M docbook/kst/data-chapter.docbook
M docbook/kst/index.docbook
M docbook/kst/tutorial.docbook

Log Message:
-----------
Continuing the docbook re-write.


Commit: d0c9f03991f725308e861184b7db3d50de4e6a73
https://github.com/Kst-plot/kst/commit/d0c9f03991f725308e861184b7db3d50de4e6a73
Author: Barth Netterfield <***@astro.utoronto.ca>
Date: 2017-03-02 (Thu, 02 Mar 2017)

Changed paths:
A docbook/kst/Diagram-kst-frames.svgz
A docbook/kst/Screenshot-kst-ascii-config.png
A docbook/kst/Screenshot-kst-datasource-selector.png
A docbook/kst/Screenshot-kst-filter-dialog.png
A docbook/kst/Screenshot-kst-filter-menu.png
A docbook/kst/Screenshot-kst-filtered-curve.png

Log Message:
-----------
Some figures for the docbook re-write.


Commit: 0f1c525ee8de4a87fd104c5ae4989251f570702b
https://github.com/Kst-plot/kst/commit/0f1c525ee8de4a87fd104c5ae4989251f570702b
Author: Barth Netterfield <***@astro.utoronto.ca>
Date: 2017-03-02 (Thu, 02 Mar 2017)

Changed paths:
M devel-docs/BugsAndFeatures
M pyKst/demo/datavector.py
M pyKst/demo/numpy_matrix.py
M pyKst/demo/numpy_vector.py
M pyKst/demo/plot_layout.py
M pyKst/pykst.py
M src/libkstapp/scriptserver.cpp
M src/libkstapp/scriptserver.h

Log Message:
-----------
Fix/improve pykst getting lists of objects.

Inspired by a patch from Steve Benton.


Compare: https://github.com/Kst-plot/kst/compare/a795efc848a1...0f1c525ee8de