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

Sat Sep 14 02:36:25 BST 2019

  Branch: refs/heads/master
  Home:   https://github.com/Kst-plot/kst
  Commit: 6ac85ab5f48453fb76cd93a5ba0e001208cfb25b
      https://github.com/Kst-plot/kst/commit/6ac85ab5f48453fb76cd93a5ba0e001208cfb25b
  Author: l10n daemon script <scripty at kde.org>
  Date:   2018-12-29 (Sat, 29 Dec 2018)

  Changed paths:
    M old_datasources/dmc/kstdata_dmc.desktop
    M old_datasources/healpix/kstdata_healpix.desktop
    M old_datasources/lfiio/kstdata_lfiio.desktop
    M old_datasources/plankIDEF/kstdata_planckIDEF.desktop
    M src/datasources/ascii/kstdata_ascii.desktop
    M src/datasources/bis/kstdata_bissource.desktop
    M src/datasources/dirfilesource/kstdata_dirfilesource.desktop
    M src/datasources/fitsimage/kstdata_fitsimage.desktop
    M src/datasources/fitstable/kstdata_fitstable.desktop
    M src/datasources/its/kstdata_itssource.desktop
    M src/datasources/matlab/kstdata_matlab.desktop
    M src/datasources/netcdf/kstdata_netcdf.desktop
    M src/datasources/qimagesource/kstdata_qimagesource.desktop
    M src/datasources/sampledatasource/kstdata_sampledatasource.desktop
    M src/datasources/sourcelist/kstdata_sourcelist.desktop
    M src/datasources/tiff16source/kstdata_tiff16source.desktop
    M src/kst/kst2.desktop
    M src/plugins/dataobject/activitylevel/kstplugin_activitylevel.desktop
    M src/plugins/dataobject/bin/kstplugin_bin.desktop
    M src/plugins/dataobject/chop/kstplugin_chop.desktop
    M src/plugins/dataobject/convolution/convolve/kstplugin_convolve.desktop
    M src/plugins/dataobject/convolution/deconvolve/kstplugin_deconvolve.desktop
    M src/plugins/dataobject/correlation/autocorrelation/kstplugin_autocorrelation.desktop
    M src/plugins/dataobject/correlation/crosscorrelation/kstplugin_crosscorrelation.desktop
    M src/plugins/dataobject/crossspectrum/kstplugin_crossspectrum.desktop
    M src/plugins/dataobject/effectivebandwidth/kstplugin_effectivebandwidth.desktop
    M src/plugins/dataobject/genericfilter/kstplugin_genericfilter.desktop
    M src/plugins/dataobject/interpolations/akima/kstplugin_akima.desktop
    M src/plugins/dataobject/interpolations/akimaperiodic/kstplugin_akimaperiodic.desktop
    M src/plugins/dataobject/interpolations/cspline/kstplugin_akima.desktop
    M src/plugins/dataobject/interpolations/csplineperiodic/kstplugin_csplineperiodic.desktop
    M src/plugins/dataobject/interpolations/linear/kstplugin_linear.desktop
    M src/plugins/dataobject/interpolations/polynomial/kstplugin_polynomial.desktop
    M src/plugins/dataobject/linefit/kstplugin_linefit.desktop
    M src/plugins/dataobject/lockin/kstplugin_lockin.desktop
    M src/plugins/dataobject/noiseaddition/kstplugin_noiseaddition.desktop
    M src/plugins/dataobject/periodogram/kstplugin_periodogram.desktop
    M src/plugins/dataobject/phase/kstplugin_phase.desktop
    M src/plugins/dataobject/shift/kstplugin_shift.desktop
    M src/plugins/dataobject/statistics/kstplugin_statistics.desktop
    M src/plugins/dataobject/syncbin/kstplugin_syncbin.desktop
    M src/plugins/filters/butterworth_bandpass/kstplugin_filter_butterworth_bandpass.desktop
    M src/plugins/filters/butterworth_bandstop/kstplugin_filter_butterworth_bandstop.desktop
    M src/plugins/filters/butterworth_highpass/kstplugin_filter_butterworth_highpass.desktop
    M src/plugins/filters/butterworth_lowpass/kstplugin_filter_butterworth_lowpass.desktop
    M src/plugins/filters/cumulativeaverage/kstplugin_cumulativeaverage.desktop
    M src/plugins/filters/cumulativesum/kstplugin_cumulativesum.desktop
    M src/plugins/filters/despike/kstplugin_filter_despike.desktop
    M src/plugins/filters/differentiation/kstplugin_differentiation.desktop
    M src/plugins/filters/flag/kstplugin_filter_flag.desktop
    M src/plugins/filters/unwind/kstplugin_filter_unwind.desktop
    M src/plugins/filters/window/kstplugin_filter_window.desktop
    M src/plugins/fits/exponential_unweighted/kstplugin_fits_exponential_unweighted.desktop
    M src/plugins/fits/exponential_weighted/kstplugin_fits_exponential_weighted.desktop
    M src/plugins/fits/gaussian_unweighted/kstplugin_fits_gaussian_unweighted.desktop
    M src/plugins/fits/gaussian_weighted/kstplugin_fits_gaussian_weighted.desktop
    M src/plugins/fits/gradient_unweighted/kstplugin_fits_gradient_unweighted.desktop
    M src/plugins/fits/gradient_weighted/kstplugin_fits_gradient_weighted.desktop
    M src/plugins/fits/kneefrequency/kstplugin_fits_kneefrequency.desktop
    M src/plugins/fits/linear_unweighted/kstplugin_fits_linear_unweighted.desktop
    M src/plugins/fits/linear_weighted/kstplugin_fits_linear_weighted.desktop
    M src/plugins/fits/lorentzian_unweighted/kstplugin_fits_lorentzian_unweighted.desktop
    M src/plugins/fits/lorentzian_weighted/kstplugin_fits_lorentzian_weighted.desktop
    M src/plugins/fits/polynomial_unweighted/kstplugin_fits_polynomial_unweighted.desktop
    M src/plugins/fits/polynomial_weighted/kstplugin_fits_polynomial_weighted.desktop
    M src/plugins/fits/sinusoid_unweighted/kstplugin_fits_sinusoid_unweighted.desktop
    M src/plugins/fits/sinusoid_weighted/kstplugin_fits_sinusoid_weighted.desktop
    M src/plugins/sampleplugin/kstplugin_sampleplugin.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: e50b54d79f9ac21f534950e1049b35faeab0eb0e
      https://github.com/Kst-plot/kst/commit/e50b54d79f9ac21f534950e1049b35faeab0eb0e
  Author: l10n daemon script <scripty at kde.org>
  Date:   2018-12-29 (Sat, 29 Dec 2018)

  Changed paths:
    M old_datasources/dmc/kstdata_dmc.desktop
    M old_datasources/healpix/kstdata_healpix.desktop
    M old_datasources/lfiio/kstdata_lfiio.desktop
    M old_datasources/plankIDEF/kstdata_planckIDEF.desktop
    M src/datasources/ascii/kstdata_ascii.desktop
    M src/datasources/bis/kstdata_bissource.desktop
    M src/datasources/dirfilesource/kstdata_dirfilesource.desktop
    M src/datasources/fitsimage/kstdata_fitsimage.desktop
    M src/datasources/fitstable/kstdata_fitstable.desktop
    M src/datasources/its/kstdata_itssource.desktop
    M src/datasources/matlab/kstdata_matlab.desktop
    M src/datasources/netcdf/kstdata_netcdf.desktop
    M src/datasources/qimagesource/kstdata_qimagesource.desktop
    M src/datasources/sampledatasource/kstdata_sampledatasource.desktop
    M src/datasources/sourcelist/kstdata_sourcelist.desktop
    M src/datasources/tiff16source/kstdata_tiff16source.desktop
    M src/kst/kst2.desktop
    M src/plugins/dataobject/activitylevel/kstplugin_activitylevel.desktop
    M src/plugins/dataobject/bin/kstplugin_bin.desktop
    M src/plugins/dataobject/chop/kstplugin_chop.desktop
    M src/plugins/dataobject/convolution/convolve/kstplugin_convolve.desktop
    M src/plugins/dataobject/convolution/deconvolve/kstplugin_deconvolve.desktop
    M src/plugins/dataobject/correlation/autocorrelation/kstplugin_autocorrelation.desktop
    M src/plugins/dataobject/correlation/crosscorrelation/kstplugin_crosscorrelation.desktop
    M src/plugins/dataobject/crossspectrum/kstplugin_crossspectrum.desktop
    M src/plugins/dataobject/effectivebandwidth/kstplugin_effectivebandwidth.desktop
    M src/plugins/dataobject/genericfilter/kstplugin_genericfilter.desktop
    M src/plugins/dataobject/interpolations/akima/kstplugin_akima.desktop
    M src/plugins/dataobject/interpolations/akimaperiodic/kstplugin_akimaperiodic.desktop
    M src/plugins/dataobject/interpolations/cspline/kstplugin_akima.desktop
    M src/plugins/dataobject/interpolations/csplineperiodic/kstplugin_csplineperiodic.desktop
    M src/plugins/dataobject/interpolations/linear/kstplugin_linear.desktop
    M src/plugins/dataobject/interpolations/polynomial/kstplugin_polynomial.desktop
    M src/plugins/dataobject/linefit/kstplugin_linefit.desktop
    M src/plugins/dataobject/lockin/kstplugin_lockin.desktop
    M src/plugins/dataobject/noiseaddition/kstplugin_noiseaddition.desktop
    M src/plugins/dataobject/periodogram/kstplugin_periodogram.desktop
    M src/plugins/dataobject/phase/kstplugin_phase.desktop
    M src/plugins/dataobject/shift/kstplugin_shift.desktop
    M src/plugins/dataobject/statistics/kstplugin_statistics.desktop
    M src/plugins/dataobject/syncbin/kstplugin_syncbin.desktop
    M src/plugins/filters/butterworth_bandpass/kstplugin_filter_butterworth_bandpass.desktop
    M src/plugins/filters/butterworth_bandstop/kstplugin_filter_butterworth_bandstop.desktop
    M src/plugins/filters/butterworth_highpass/kstplugin_filter_butterworth_highpass.desktop
    M src/plugins/filters/butterworth_lowpass/kstplugin_filter_butterworth_lowpass.desktop
    M src/plugins/filters/cumulativeaverage/kstplugin_cumulativeaverage.desktop
    M src/plugins/filters/cumulativesum/kstplugin_cumulativesum.desktop
    M src/plugins/filters/despike/kstplugin_filter_despike.desktop
    M src/plugins/filters/differentiation/kstplugin_differentiation.desktop
    M src/plugins/filters/flag/kstplugin_filter_flag.desktop
    M src/plugins/filters/unwind/kstplugin_filter_unwind.desktop
    M src/plugins/filters/window/kstplugin_filter_window.desktop
    M src/plugins/fits/exponential_unweighted/kstplugin_fits_exponential_unweighted.desktop
    M src/plugins/fits/exponential_weighted/kstplugin_fits_exponential_weighted.desktop
    M src/plugins/fits/gaussian_unweighted/kstplugin_fits_gaussian_unweighted.desktop
    M src/plugins/fits/gaussian_weighted/kstplugin_fits_gaussian_weighted.desktop
    M src/plugins/fits/gradient_unweighted/kstplugin_fits_gradient_unweighted.desktop
    M src/plugins/fits/gradient_weighted/kstplugin_fits_gradient_weighted.desktop
    M src/plugins/fits/kneefrequency/kstplugin_fits_kneefrequency.desktop
    M src/plugins/fits/linear_unweighted/kstplugin_fits_linear_unweighted.desktop
    M src/plugins/fits/linear_weighted/kstplugin_fits_linear_weighted.desktop
    M src/plugins/fits/lorentzian_unweighted/kstplugin_fits_lorentzian_unweighted.desktop
    M src/plugins/fits/lorentzian_weighted/kstplugin_fits_lorentzian_weighted.desktop
    M src/plugins/fits/polynomial_unweighted/kstplugin_fits_polynomial_unweighted.desktop
    M src/plugins/fits/polynomial_weighted/kstplugin_fits_polynomial_weighted.desktop
    M src/plugins/fits/sinusoid_unweighted/kstplugin_fits_sinusoid_unweighted.desktop
    M src/plugins/fits/sinusoid_weighted/kstplugin_fits_sinusoid_weighted.desktop
    M src/plugins/sampleplugin/kstplugin_sampleplugin.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: 9256dbeb8987afb7a2b4a91aa6b879d091433a54
      https://github.com/Kst-plot/kst/commit/9256dbeb8987afb7a2b4a91aa6b879d091433a54
  Author: Mathew Galloway:wq <mathew.galloway at mail.utoronto.ca>
  Date:   2019-02-04 (Mon, 04 Feb 2019)

  Changed paths:
    A cmake/modules/FindHDF5.cmake
    A sample_data/hdf5AllType.hdf5
    A src/datasources/hdf5/hdf5.cpp
    A src/datasources/hdf5/hdf5.h
    A src/datasources/hdf5/hdf5.pro
    A src/datasources/hdf5/kstdata_hdf5.desktop

  Log Message:
  -----------
  initial commit of hdf5 datasource

  Commit: f3f3f903b8a5aa693d5ffb3d47e65c12b1e83d35
      https://github.com/Kst-plot/kst/commit/f3f3f903b8a5aa693d5ffb3d47e65c12b1e83d35
  Author: l10n daemon script <scripty at kde.org>
  Date:   2019-02-05 (Tue, 05 Feb 2019)

  Changed paths:
    M src/datasources/hdf5/kstdata_hdf5.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: a153f7519a90c70c057b0f46e5347d5acaced29e
      https://github.com/Kst-plot/kst/commit/a153f7519a90c70c057b0f46e5347d5acaced29e
  Author: Mathew Galloway:wq <mathew.galloway at mail.utoronto.ca>
  Date:   2019-02-05 (Tue, 05 Feb 2019)

  Changed paths:
    M CMakeLists.txt
    M src/datasources/CMakeLists.txt
    M src/datasources/HOWTO_add_a_datasource.txt

  Log Message:
  -----------
  additional hdf5 datasource files that were not added last time because I am dumb

  Commit: ddc370136f1a0fe6e2ab7d9c7a9d5e374fda114e
      https://github.com/Kst-plot/kst/commit/ddc370136f1a0fe6e2ab7d9c7a9d5e374fda114e
  Author: Mathew Galloway:wq <mathew.galloway at mail.utoronto.ca>
  Date:   2019-02-05 (Tue, 05 Feb 2019)

  Changed paths:
    M src/datasources/hdf5/kstdata_hdf5.desktop

  Log Message:
  -----------
  Merge branch 'master' of git://anongit.kde.org/kst-plot

  Commit: f3213ddc96687a1dc3d1131e5ba8f9ffe7850463
      https://github.com/Kst-plot/kst/commit/f3213ddc96687a1dc3d1131e5ba8f9ffe7850463
  Author: l10n daemon script <scripty at kde.org>
  Date:   2019-02-06 (Wed, 06 Feb 2019)

  Changed paths:
    M src/datasources/hdf5/kstdata_hdf5.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: 1f0c6797adc357ad6371a67d06f97f09a5dd49fb
      https://github.com/Kst-plot/kst/commit/1f0c6797adc357ad6371a67d06f97f09a5dd49fb
  Author: l10n daemon script <scripty at kde.org>
  Date:   2019-02-11 (Mon, 11 Feb 2019)

  Changed paths:
    M src/datasources/hdf5/kstdata_hdf5.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: aac161ce90da0689a1991d6a605b35131fc861bb
      https://github.com/Kst-plot/kst/commit/aac161ce90da0689a1991d6a605b35131fc861bb
  Author: l10n daemon script <scripty at kde.org>
  Date:   2019-02-13 (Wed, 13 Feb 2019)

  Changed paths:
    M src/kst/x-kst.xml

  Log Message:
  -----------
  GIT_SILENT made messages (after extraction)

  Commit: bd7f94c15016f6c5aa6a1d13051cb76defbb607c
      https://github.com/Kst-plot/kst/commit/bd7f94c15016f6c5aa6a1d13051cb76defbb607c
  Author: l10n daemon script <scripty at kde.org>
  Date:   2019-02-14 (Thu, 14 Feb 2019)

  Changed paths:
    M src/datasources/hdf5/kstdata_hdf5.desktop
    M src/datasources/its/kstdata_itssource.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: d10e6b0c3c220de715df36d2d6470763eb660e8e
      https://github.com/Kst-plot/kst/commit/d10e6b0c3c220de715df36d2d6470763eb660e8e
  Author: l10n daemon script <scripty at kde.org>
  Date:   2019-03-03 (Sun, 03 Mar 2019)

  Changed paths:
    M src/datasources/hdf5/kstdata_hdf5.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: 373b19c1a8ee7ac1bfeb8ad55dc8ef02ca8c11f9
      https://github.com/Kst-plot/kst/commit/373b19c1a8ee7ac1bfeb8ad55dc8ef02ca8c11f9
  Author: l10n daemon script <scripty at kde.org>
  Date:   2019-03-23 (Sat, 23 Mar 2019)

  Changed paths:
    M src/datasources/hdf5/kstdata_hdf5.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: 35c35e17626138375b0b89ed4a8ec95abf6e481c
      https://github.com/Kst-plot/kst/commit/35c35e17626138375b0b89ed4a8ec95abf6e481c
  Author: l10n daemon script <scripty at kde.org>
  Date:   2019-03-25 (Mon, 25 Mar 2019)

  Changed paths:
    M src/datasources/hdf5/kstdata_hdf5.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: 8294c2fe7a4e1cd42fcb9e1c0f8ad46f620fe38b
      https://github.com/Kst-plot/kst/commit/8294c2fe7a4e1cd42fcb9e1c0f8ad46f620fe38b
  Author: l10n daemon script <scripty at kde.org>
  Date:   2019-04-25 (Thu, 25 Apr 2019)

  Changed paths:
    M src/kst/x-kst.xml

  Log Message:
  -----------
  GIT_SILENT made messages (after extraction)

  Commit: 3781b17c887d39682738e7cfce52230014053237
      https://github.com/Kst-plot/kst/commit/3781b17c887d39682738e7cfce52230014053237
  Author: l10n daemon script <scripty at kde.org>
  Date:   2019-07-05 (Fri, 05 Jul 2019)

  Changed paths:
    M src/datasources/bis/kstdata_bissource.desktop
    M src/datasources/hdf5/kstdata_hdf5.desktop
    M src/datasources/its/kstdata_itssource.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: 3893db2ef01fe97b37f74a688874b18db8c7643d
      https://github.com/Kst-plot/kst/commit/3893db2ef01fe97b37f74a688874b18db8c7643d
  Author: l10n daemon script <scripty at kde.org>
  Date:   2019-07-15 (Mon, 15 Jul 2019)

  Changed paths:
    M src/kst/x-kst.xml

  Log Message:
  -----------
  GIT_SILENT made messages (after extraction)

  Commit: e09cb50f57d309d7d75ed0385f33167f103e8a0e
      https://github.com/Kst-plot/kst/commit/e09cb50f57d309d7d75ed0385f33167f103e8a0e
  Author: l10n daemon script <scripty at kde.org>
  Date:   2019-07-15 (Mon, 15 Jul 2019)

  Changed paths:
    M src/datasources/hdf5/kstdata_hdf5.desktop
    M src/datasources/its/kstdata_itssource.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: 86bde08c5e6a5b397e0778ef833efe8e33983bef
      https://github.com/Kst-plot/kst/commit/86bde08c5e6a5b397e0778ef833efe8e33983bef
  Author: l10n daemon script <scripty at kde.org>
  Date:   2019-07-22 (Mon, 22 Jul 2019)

  Changed paths:
    M src/kst/x-kst.xml

  Log Message:
  -----------
  GIT_SILENT made messages (after extraction)

  Commit: 1096bd53a5dd2d5c7e1301d5d0b1659f4fea51b3
      https://github.com/Kst-plot/kst/commit/1096bd53a5dd2d5c7e1301d5d0b1659f4fea51b3
  Author: l10n daemon script <scripty at kde.org>
  Date:   2019-09-12 (Thu, 12 Sep 2019)

  Changed paths:
    M src/datasources/hdf5/kstdata_hdf5.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: 129d6476eeb2013857821103ff9380fe34776a65
      https://github.com/Kst-plot/kst/commit/129d6476eeb2013857821103ff9380fe34776a65
  Author: Barth Netterfield <netterfield at astro.utoronto.ca>
  Date:   2019-09-13 (Fri, 13 Sep 2019)

  Changed paths:
    R build-kst
    M src/libkstapp/commandlineparser.cpp

  Log Message:
  -----------
  Apply patch from tormodvolden.

Message grammar typos and console logs on windows.

  Commit: 274079814c9841333716eb3503cf26c3899e8b40
      https://github.com/Kst-plot/kst/commit/274079814c9841333716eb3503cf26c3899e8b40
  Author: Barth Netterfield <netterfield at astro.utoronto.ca>
  Date:   2019-09-13 (Fri, 13 Sep 2019)

  Changed paths:
    M devel-docs/BugsAndFeatures
    M src/datasources/its/its.c
    M src/libkstapp/shortcutdialog.cpp

  Log Message:
  -----------
  Fix build for ubuntu 19.04

Add missing include.

Compare: https://github.com/Kst-plot/kst/compare/74197368b1e8...274079814c98