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

netterfield noreply at github.com
Sun Aug 4 23:19:10 BST 2024


  Branch: refs/heads/master
  Home:   https://github.com/Kst-plot/kst
  Commit: 2b8e03e3b5ac0a6038f08aeb03c2a7f2c4c1166d
      https://github.com/Kst-plot/kst/commit/2b8e03e3b5ac0a6038f08aeb03c2a7f2c4c1166d
  Author: l10n daemon script <scripty at kde.org>
  Date:   2022-01-16 (Sun, 16 Jan 2022)

  Changed paths:
    M src/datasources/tiff16source/kstdata_tiff16source.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: 40cdf2d397e4277ee7226188ef89ae3e0f12d884
      https://github.com/Kst-plot/kst/commit/40cdf2d397e4277ee7226188ef89ae3e0f12d884
  Author: Max Brazhnikov <makc at FreeBSD.org>
  Date:   2022-02-16 (Wed, 16 Feb 2022)

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

  Log Message:
  -----------
  Fix build with HDF5-1.12


  Commit: c62a8cb62071678a3b4ad43666d2f18db3469cae
      https://github.com/Kst-plot/kst/commit/c62a8cb62071678a3b4ad43666d2f18db3469cae
  Author: l10n daemon script <scripty at kde.org>
  Date:   2022-04-01 (Fri, 01 Apr 2022)

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

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


  Commit: 5d734f489c8f711903590ee2c9db6981c088ac3d
      https://github.com/Kst-plot/kst/commit/5d734f489c8f711903590ee2c9db6981c088ac3d
  Author: l10n daemon script <scripty at kde.org>
  Date:   2022-04-01 (Fri, 01 Apr 2022)

  Changed paths:
    M old_datasources/lfiio/kstdata_lfiio.desktop
    M src/datasources/ascii/kstdata_ascii.desktop
    M src/datasources/fitstable/kstdata_fitstable.desktop
    M src/datasources/matlab/kstdata_matlab.desktop
    M src/datasources/netcdf/kstdata_netcdf.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: 083734c9a4523574f468f8f1ac966f8856012acb
      https://github.com/Kst-plot/kst/commit/083734c9a4523574f468f8f1ac966f8856012acb
  Author: l10n daemon script <scripty at kde.org>
  Date:   2022-05-31 (Tue, 31 May 2022)

  Changed paths:
    M src/plugins/dataobject/syncbin/kstplugin_syncbin.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: 2ab14ad51541213d25b6810f3ca31416ab166180
      https://github.com/Kst-plot/kst/commit/2ab14ad51541213d25b6810f3ca31416ab166180
  Author: l10n daemon script <scripty at kde.org>
  Date:   2022-06-07 (Tue, 07 Jun 2022)

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

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


  Commit: 748ffdf32d3f484cda5caa64141e648bbb3c801c
      https://github.com/Kst-plot/kst/commit/748ffdf32d3f484cda5caa64141e648bbb3c801c
  Author: l10n daemon script <scripty at kde.org>
  Date:   2022-06-07 (Tue, 07 Jun 2022)

  Changed paths:
    M old_datasources/dmc/kstdata_dmc.desktop
    M old_datasources/healpix/kstdata_healpix.desktop
    M old_datasources/lfiio/kstdata_lfiio.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/hdf5/kstdata_hdf5.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/tiff16source/kstdata_tiff16source.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: 65fe992dc8d12c27f88f898cfed7aff4c4aef2bd
      https://github.com/Kst-plot/kst/commit/65fe992dc8d12c27f88f898cfed7aff4c4aef2bd
  Author: l10n daemon script <scripty at kde.org>
  Date:   2022-06-09 (Thu, 09 Jun 2022)

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

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


  Commit: cd6df3f2a99ca616887e3ffc9bc2a3dd2b62d2d8
      https://github.com/Kst-plot/kst/commit/cd6df3f2a99ca616887e3ffc9bc2a3dd2b62d2d8
  Author: l10n daemon script <scripty at kde.org>
  Date:   2022-06-09 (Thu, 09 Jun 2022)

  Changed paths:
    M old_datasources/healpix/kstdata_healpix.desktop
    M old_datasources/lfiio/kstdata_lfiio.desktop
    M src/datasources/ascii/kstdata_ascii.desktop
    M src/datasources/hdf5/kstdata_hdf5.desktop
    M src/datasources/matlab/kstdata_matlab.desktop
    M src/datasources/netcdf/kstdata_netcdf.desktop
    M src/datasources/sampledatasource/kstdata_sampledatasource.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: 0f0e52fdf5323ffc113489b27765de535645b57f
      https://github.com/Kst-plot/kst/commit/0f0e52fdf5323ffc113489b27765de535645b57f
  Author: l10n daemon script <scripty at kde.org>
  Date:   2022-06-13 (Mon, 13 Jun 2022)

  Changed paths:
    M old_datasources/dmc/kstdata_dmc.desktop
    M old_datasources/healpix/kstdata_healpix.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/hdf5/kstdata_hdf5.desktop
    M src/datasources/matlab/kstdata_matlab.desktop
    M src/datasources/qimagesource/kstdata_qimagesource.desktop
    M src/datasources/sampledatasource/kstdata_sampledatasource.desktop
    M src/datasources/tiff16source/kstdata_tiff16source.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: 0a066ede4d743207d9968f5ef15acd28d6a6c250
      https://github.com/Kst-plot/kst/commit/0a066ede4d743207d9968f5ef15acd28d6a6c250
  Author: Po-Chuan Hsieh <sunpoet at sunpoet.net>
  Date:   2022-07-11 (Mon, 11 Jul 2022)

  Changed paths:
    M src/datasources/hdf5/hdf5.h

  Log Message:
  -----------
  Fix build with new HDF5 (1.10.8+ or 1.12.1+)

Newer HDF5 changes hdf5.h from _HDF_H to HDF_H [1] therefore it collides
with hdf5.h from kst [2].

[1] https://github.com/HDFGroup/hdf5/blob/hdf5-1_10_8/src/hdf5.h#L20
    https://github.com/HDFGroup/hdf5/blob/hdf5-1_12_1/src/hdf5.h#L20
[2] https://invent.kde.org/graphics/kst-plot/-/blob/master/src/datasources/hdf5/hdf5.h#L15


  Commit: 139ec478b50e42fb65219359068a33be22765619
      https://github.com/Kst-plot/kst/commit/139ec478b50e42fb65219359068a33be22765619
  Author: l10n daemon script <scripty at kde.org>
  Date:   2022-08-16 (Tue, 16 Aug 2022)

  Changed paths:
    M src/datasources/hdf5/kstdata_hdf5.desktop
    M src/datasources/its/kstdata_itssource.desktop
    M src/datasources/matlab/kstdata_matlab.desktop
    M src/datasources/qimagesource/kstdata_qimagesource.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: 7b5c79355eb04da7cd214a0432de8409bf58ade6
      https://github.com/Kst-plot/kst/commit/7b5c79355eb04da7cd214a0432de8409bf58ade6
  Author: l10n daemon script <scripty at kde.org>
  Date:   2022-09-08 (Thu, 08 Sep 2022)

  Changed paths:
    M src/kst/kst2.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: 4f19c042be4cd9a912b49ed982bcd8081c5278fb
      https://github.com/Kst-plot/kst/commit/4f19c042be4cd9a912b49ed982bcd8081c5278fb
  Author: l10n daemon script <scripty at kde.org>
  Date:   2022-09-23 (Fri, 23 Sep 2022)

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

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


  Commit: 070e3788659a71c4f762837e58e8a4a4e1cc06c5
      https://github.com/Kst-plot/kst/commit/070e3788659a71c4f762837e58e8a4a4e1cc06c5
  Author: l10n daemon script <scripty at kde.org>
  Date:   2022-09-23 (Fri, 23 Sep 2022)

  Changed paths:
    M src/datasources/fitsimage/kstdata_fitsimage.desktop
    M src/datasources/netcdf/kstdata_netcdf.desktop
    M src/datasources/qimagesource/kstdata_qimagesource.desktop
    M src/datasources/tiff16source/kstdata_tiff16source.desktop
    M src/kst/kst2.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: b1082f469501cdd42914e37790fd1d0119db0095
      https://github.com/Kst-plot/kst/commit/b1082f469501cdd42914e37790fd1d0119db0095
  Author: l10n daemon script <scripty at kde.org>
  Date:   2022-10-20 (Thu, 20 Oct 2022)

  Changed paths:
    M src/kst/kst2.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: 358047575df8ccabd371a1579d425181ec7a08a1
      https://github.com/Kst-plot/kst/commit/358047575df8ccabd371a1579d425181ec7a08a1
  Author: l10n daemon script <scripty at kde.org>
  Date:   2022-10-26 (Wed, 26 Oct 2022)

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

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


  Commit: 5fdd819a4411a9278bdb45aaddd99a6aada56341
      https://github.com/Kst-plot/kst/commit/5fdd819a4411a9278bdb45aaddd99a6aada56341
  Author: l10n daemon script <scripty at kde.org>
  Date:   2022-10-26 (Wed, 26 Oct 2022)

  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/hdf5/kstdata_hdf5.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/correlation/autocorrelation/kstplugin_autocorrelation.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: de1348e6d2004f670ae95d78fdc7854a7d9bd4ec
      https://github.com/Kst-plot/kst/commit/de1348e6d2004f670ae95d78fdc7854a7d9bd4ec
  Author: l10n daemon script <scripty at kde.org>
  Date:   2023-04-15 (Sat, 15 Apr 2023)

  Changed paths:
    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

  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: 873e6737cb2cd4b6621ecfcf9b8535ccada54362
      https://github.com/Kst-plot/kst/commit/873e6737cb2cd4b6621ecfcf9b8535ccada54362
  Author: l10n daemon script <scripty at kde.org>
  Date:   2023-04-17 (Mon, 17 Apr 2023)

  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: 5386c0c760ea96ee2bdfe892f89dce616650ad31
      https://github.com/Kst-plot/kst/commit/5386c0c760ea96ee2bdfe892f89dce616650ad31
  Author: l10n daemon script <scripty at kde.org>
  Date:   2023-04-29 (Sat, 29 Apr 2023)

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

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


  Commit: 6123455e80871f10e4499c23455aae8552178f92
      https://github.com/Kst-plot/kst/commit/6123455e80871f10e4499c23455aae8552178f92
  Author: l10n daemon script <scripty at kde.org>
  Date:   2023-04-29 (Sat, 29 Apr 2023)

  Changed paths:
    M src/plugins/filters/cumulativeaverage/kstplugin_cumulativeaverage.desktop
    M src/plugins/filters/cumulativesum/kstplugin_cumulativesum.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: 7f7cf8b8cbeba5975c33ab10cca0cf20829ff800
      https://github.com/Kst-plot/kst/commit/7f7cf8b8cbeba5975c33ab10cca0cf20829ff800
  Author: l10n daemon script <scripty at kde.org>
  Date:   2023-07-03 (Mon, 03 Jul 2023)

  Changed paths:
    M old_datasources/healpix/kstdata_healpix.desktop
    M src/datasources/fitstable/kstdata_fitstable.desktop
    M src/datasources/matlab/kstdata_matlab.desktop
    M src/datasources/netcdf/kstdata_netcdf.desktop
    M src/datasources/sampledatasource/kstdata_sampledatasource.desktop
    M src/kst/kst2.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: bfbbfb393a028feb7785460205bf11114e86886f
      https://github.com/Kst-plot/kst/commit/bfbbfb393a028feb7785460205bf11114e86886f
  Author: l10n daemon script <scripty at kde.org>
  Date:   2023-07-09 (Sun, 09 Jul 2023)

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

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


  Commit: 775036365686162957349611c93bcacb8bdf0fce
      https://github.com/Kst-plot/kst/commit/775036365686162957349611c93bcacb8bdf0fce
  Author: l10n daemon script <scripty at kde.org>
  Date:   2023-07-09 (Sun, 09 Jul 2023)

  Changed paths:
    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: ab7d3bbb312814455c11d9b61cb0efee35d5a77e
      https://github.com/Kst-plot/kst/commit/ab7d3bbb312814455c11d9b61cb0efee35d5a77e
  Author: l10n daemon script <scripty at kde.org>
  Date:   2023-07-14 (Fri, 14 Jul 2023)

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

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


  Commit: 4d4021f82e11495217f48a5a94c9266c01098722
      https://github.com/Kst-plot/kst/commit/4d4021f82e11495217f48a5a94c9266c01098722
  Author: l10n daemon script <scripty at kde.org>
  Date:   2023-07-14 (Fri, 14 Jul 2023)

  Changed paths:
    M old_datasources/dmc/kstdata_dmc.desktop
    M old_datasources/healpix/kstdata_healpix.desktop
    M old_datasources/lfiio/kstdata_lfiio.desktop
    M src/datasources/ascii/kstdata_ascii.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/hdf5/kstdata_hdf5.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/tiff16source/kstdata_tiff16source.desktop
    M src/kst/kst2.desktop
    M src/plugins/dataobject/activitylevel/kstplugin_activitylevel.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: 104887979d3ac3c0b54da561f95ecaaadce70cea
      https://github.com/Kst-plot/kst/commit/104887979d3ac3c0b54da561f95ecaaadce70cea
  Author: l10n daemon script <scripty at kde.org>
  Date:   2023-07-28 (Fri, 28 Jul 2023)

  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/hdf5/kstdata_hdf5.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: 02366d7660cc9e5e271b68079b15081afe37ea07
      https://github.com/Kst-plot/kst/commit/02366d7660cc9e5e271b68079b15081afe37ea07
  Author: l10n daemon script <scripty at kde.org>
  Date:   2023-08-28 (Mon, 28 Aug 2023)

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

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


  Commit: 59e066d9467ea73fc6e5cc0013124fa97ad15b4b
      https://github.com/Kst-plot/kst/commit/59e066d9467ea73fc6e5cc0013124fa97ad15b4b
  Author: l10n daemon script <scripty at kde.org>
  Date:   2023-10-30 (Mon, 30 Oct 2023)

  Changed paths:
    M old_datasources/healpix/kstdata_healpix.desktop
    M old_datasources/lfiio/kstdata_lfiio.desktop
    M old_datasources/plankIDEF/kstdata_planckIDEF.desktop
    M src/datasources/dirfilesource/kstdata_dirfilesource.desktop
    M src/datasources/qimagesource/kstdata_qimagesource.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/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: 12f40e2ae87339bae45b527a305c4ba0b4e2a414
      https://github.com/Kst-plot/kst/commit/12f40e2ae87339bae45b527a305c4ba0b4e2a414
  Author: l10n daemon script <scripty at kde.org>
  Date:   2023-11-04 (Sat, 04 Nov 2023)

  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/hdf5/kstdata_hdf5.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: 6a370ecfd80f19f38779997f4943a6618da012bf
      https://github.com/Kst-plot/kst/commit/6a370ecfd80f19f38779997f4943a6618da012bf
  Author: l10n daemon script <scripty at kde.org>
  Date:   2023-11-07 (Tue, 07 Nov 2023)

  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/hdf5/kstdata_hdf5.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: ae90eeffe5bc003d26aeab9e15dbd202a2547f66
      https://github.com/Kst-plot/kst/commit/ae90eeffe5bc003d26aeab9e15dbd202a2547f66
  Author: Oliver Kellogg <okellogg at users.sourceforge.net>
  Date:   2024-04-03 (Wed, 03 Apr 2024)

  Changed paths:
    M src/widgets/labelbuilder.cpp

  Log Message:
  -----------
  src/widgets/labelbuilder.cpp (showHelp) : Address nits in html (missing <P> terminations, <br/> instead of <br>)


  Commit: e91af377e91c00b4340ac608ca8486b046e0a6d1
      https://github.com/Kst-plot/kst/commit/e91af377e91c00b4340ac608ca8486b046e0a6d1
  Author: l10n daemon script <scripty at kde.org>
  Date:   2024-05-04 (Sat, 04 May 2024)

  Changed paths:
    M src/datasources/dirfilesource/kstdata_dirfilesource.desktop
    M src/datasources/netcdf/kstdata_netcdf.desktop
    M src/datasources/qimagesource/kstdata_qimagesource.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: aea52b365bbcf210e774240357e7776e69abd7e3
      https://github.com/Kst-plot/kst/commit/aea52b365bbcf210e774240357e7776e69abd7e3
  Author: Barth Netterfield <barth.netterfield at utoronto.ca>
  Date:   2024-06-18 (Tue, 18 Jun 2024)

  Changed paths:
    M CMakeLists.txt
    M cmake/modules/FindHDF5.cmake
    M src/datasources/ascii/asciifiledata.cpp
    M src/datasources/ascii/asciifiledata.h
    M src/datasources/ascii/asciisource.cpp
    M src/datasources/ascii/asciisource.h
    M src/datasources/ascii/kst_atof.cpp
    M src/datasources/fitsimage/fitsimage.cpp
    M src/datasources/hdf5/hdf5.cpp
    M src/datasources/matlab/matlab.cpp
    M src/kst/main.cpp
    M src/libkst/datacollection.h
    M src/libkst/datasource.cpp
    M src/libkst/datasourcepluginmanager.cpp
    M src/libkst/matrix.cpp
    M src/libkst/namedobject.cpp
    M src/libkst/updatemanager.h
    M src/libkst/vector.cpp
    M src/libkstapp/applicationsettings.cpp
    M src/libkstapp/bugreportwizard.cpp
    M src/libkstapp/commandlineparser.cpp
    M src/libkstapp/datamanager.cpp
    M src/libkstapp/datawizard.cpp
    M src/libkstapp/document.cpp
    M src/libkstapp/formatgridhelper.cpp
    M src/libkstapp/labelrenderer.h
    M src/libkstapp/logdialog.cpp
    M src/libkstapp/plotaxis.cpp
    M src/libkstapp/plotitem.cpp
    M src/libkstapp/plotitemmanager.cpp
    M src/libkstapp/plotrenderitem.cpp
    M src/libkstapp/plotrenderitem.h
    M src/libkstapp/sessionmodel.cpp
    M src/libkstapp/sharedaxisboxitem.cpp
    M src/libkstapp/vectormodel.cpp
    M src/libkstapp/view.cpp
    M src/libkstapp/viewitem.cpp
    M src/libkstapp/viewvectordialog.cpp
    M src/libkstmath/colorsequence.cpp
    M src/libkstmath/dataobject.cpp
    M src/libkstmath/escan.cpp
    M src/libkstmath/image.cpp
    M src/libkstmath/relation.cpp
    M src/plugins/filters/cumulativesum/cumulativesum.cpp
    M src/plugins/fits/non_linear_weighted.h
    M src/widgets/cclineedit.cpp
    M src/widgets/curveplacement.cpp
    M src/widgets/curveplacement.ui
    M src/widgets/curveselector.cpp
    M src/widgets/dialogdefaults.cpp
    M src/widgets/gradienteditor.cpp
    M src/widgets/matrixselector.cpp
    M src/widgets/matrixselector.ui
    M src/widgets/scalarselector.cpp
    M src/widgets/scalarselector.ui
    M src/widgets/stringselector.cpp
    M src/widgets/stringselector.ui
    M src/widgets/vectorselector.cpp

  Log Message:
  -----------
  Fix a bunch of compiler warnings.


  Commit: 6bf883762132647021feee36d3649f8b42172196
      https://github.com/Kst-plot/kst/commit/6bf883762132647021feee36d3649f8b42172196
  Author: Barth Netterfield <barth.netterfield at utoronto.ca>
  Date:   2024-06-18 (Tue, 18 Jun 2024)

  Changed paths:
    M src/images/svg_icons/kst_changenpts.svgz

  Log Message:
  -----------
  Fix change npts svg icon.


  Commit: b99ad2be9f5bbaba0d488bef03bddbca03d4622f
      https://github.com/Kst-plot/kst/commit/b99ad2be9f5bbaba0d488bef03bddbca03d4622f
  Author: Barth Netterfield <barth.netterfield at utoronto.ca>
  Date:   2024-06-18 (Tue, 18 Jun 2024)

  Changed paths:
    M src/widgets/datasourceselectordialog.cpp
    M src/widgets/datasourceselectordialog.h

  Log Message:
  -----------
  fix file dialog to work with files and dirfiles.


  Commit: 5852c5bf713d303fa5f02e4d249de3a5c0ea7ffc
      https://github.com/Kst-plot/kst/commit/5852c5bf713d303fa5f02e4d249de3a5c0ea7ffc
  Author: Barth Netterfield <barth.netterfield at utoronto.ca>
  Date:   2024-07-19 (Fri, 19 Jul 2024)

  Changed paths:
    M src/datasources/ascii/asciidatareader.cpp
    M src/datasources/ascii/asciifilebuffer.cpp
    M src/datasources/ascii/asciifilebuffer.h
    M src/datasources/ascii/asciisource.cpp
    M src/datasources/ascii/asciisource.h
    M src/libkst/datavector.cpp
    M src/libkst/object.cpp
    M src/libkst/updatemanager.cpp

  Log Message:
  -----------
  Ascii files are re-read if they get smaller.

Also fix some compiler warnings.


Compare: https://github.com/Kst-plot/kst/compare/230c5a198cba...5852c5bf713d

To unsubscribe from these emails, change your notification settings at https://github.com/Kst-plot/kst/settings/notifications


More information about the Kst mailing list