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

[netterfield]

  Branch: refs/heads/master
  Home:   https://github.com/Kst-plot/kst
  Commit: 674d8c24ed03261733766add8a04909a6a35a821
      https://github.com/Kst-plot/kst/commit/674d8c24ed03261733766add8a04909a6a35a821
  Author: l10n daemon script <scripty at kde.org>
  Date:   2024-08-05 (Mon, 05 Aug 2024)

  Changed paths:
    M src/plugins/filters/exponential/kstplugin_exponential.desktop
    M src/plugins/filters/movingaverage/kstplugin_movingaverage.desktop
    M src/plugins/filters/movingmedian/kstplugin_movingmedian.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: dcb7d4b073d67c74404087e9c1863bc811e5e154
      https://github.com/Kst-plot/kst/commit/dcb7d4b073d67c74404087e9c1863bc811e5e154
  Author: Yuri Chornoivan <yurchor at ukr.net>
  Date:   2024-08-05 (Mon, 05 Aug 2024)

  Changed paths:
    M src/plugins/filters/movingaverage/kstplugin_movingaverage.desktop

  Log Message:
  -----------
  Fix minor typo


  Commit: 194aab5c4d1222b8670fbcbc546c65a053a00e94
      https://github.com/Kst-plot/kst/commit/194aab5c4d1222b8670fbcbc546c65a053a00e94
  Author: Barth Netterfield <barth.netterfield at utoronto.ca>
  Date:   2024-08-05 (Mon, 05 Aug 2024)

  Changed paths:
    M cmake/modules/FindCFITSIO.cmake
    M cmake/modules/FindHDF5.cmake
    M cmake/modules/FindNetcdf.cmake

  Log Message:
  -----------
  cmake for hdf5 works with new library names in ubuntu 24.04


Compare: https://github.com/Kst-plot/kst/compare/413f4b09fb60...194aab5c4d12

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