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

[Barth Netterfield]

  Branch: refs/heads/master
  Home:   https://github.com/Kst-plot/kst
  Commit: 2d558383f9143699e6426ef2a80647ca18a2c612
      https://github.com/Kst-plot/kst/commit/2d558383f9143699e6426ef2a80647ca18a2c612
  Author: l10n daemon script <scripty at kde.org>
  Date:   2018-04-26 (Thu, 26 Apr 2018)

  Changed paths:
    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: a330e2776d73d7f09e7b74c00a45923cd86ed6d7
      https://github.com/Kst-plot/kst/commit/a330e2776d73d7f09e7b74c00a45923cd86ed6d7
  Author: l10n daemon script <scripty at kde.org>
  Date:   2018-04-27 (Fri, 27 Apr 2018)

  Changed paths:
    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: c78094c41eec23d4f7e56df40395c9745ab14df3
      https://github.com/Kst-plot/kst/commit/c78094c41eec23d4f7e56df40395c9745ab14df3
  Author: l10n daemon script <scripty at kde.org>
  Date:   2018-04-29 (Sun, 29 Apr 2018)

  Changed paths:
    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: c48cd470a4462d4b760115d619bc79297153f115
      https://github.com/Kst-plot/kst/commit/c48cd470a4462d4b760115d619bc79297153f115
  Author: l10n daemon script <scripty at kde.org>
  Date:   2018-04-30 (Mon, 30 Apr 2018)

  Changed paths:
    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: bfa7354a07b769cc12534707de67f09bbca0196f
      https://github.com/Kst-plot/kst/commit/bfa7354a07b769cc12534707de67f09bbca0196f
  Author: Barth Netterfield <netterfield at astro.utoronto.ca>
  Date:   2018-05-02 (Wed, 02 May 2018)

  Changed paths:
    M src/datasources/its/its.c
    M src/datasources/its/itsdatasource.cpp
    M src/libkst/object.cpp

  Log Message:
  -----------
  Minor its datasource tweaks.


  Commit: bd3b5b33d3c37367e5c59001710975c6f727e7af
      https://github.com/Kst-plot/kst/commit/bd3b5b33d3c37367e5c59001710975c6f727e7af
  Author: Barth Netterfield <netterfield at astro.utoronto.ca>
  Date:   2018-05-02 (Wed, 02 May 2018)

  Changed paths:
    M src/plugins/fits/exponential_unweighted/fitexponential_unweighted.cpp
    M src/plugins/fits/exponential_weighted/fitexponential_weighted.cpp
    M src/plugins/fits/gaussian_unweighted/fitgaussian_unweighted.cpp
    M src/plugins/fits/gaussian_weighted/fitgaussian_weighted.cpp

  Log Message:
  -----------
  More fit improvements.

Fix weighted exponential fit.
Better labels for gaussian fits.


  Commit: 39b8a6c37ac9b41528a3e648bff52a461543d8f9
      https://github.com/Kst-plot/kst/commit/39b8a6c37ac9b41528a3e648bff52a461543d8f9
  Author: Barth Netterfield <netterfield at astro.utoronto.ca>
  Date:   2018-05-02 (Wed, 02 May 2018)

  Changed paths:
    M src/libkst/datamatrix.cpp
    M src/libkstapp/matrixdialog.cpp
    M src/libkstmath/curve.cpp
    M src/libkstmath/image.cpp

  Log Message:
  -----------
  Clean up some naming rules for labels.


Compare: https://github.com/Kst-plot/kst/compare/3cdfb8914a8e...39b8a6c37ac9
      **NOTE:** This service been marked for deprecation: https://developer.github.com/changes/2018-04-25-github-services-deprecation/

      Functionality will be removed from GitHub.com on January 31st, 2019.