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

[netterfield]

  Branch: refs/heads/master
  Home:   https://github.com/Kst-plot/kst
  Commit: b9a1a136d2bf7763fc93c444fe6fc1cc33555889
      https://github.com/Kst-plot/kst/commit/b9a1a136d2bf7763fc93c444fe6fc1cc33555889
  Author: l10n daemon script <scripty at kde.org>
  Date:   2026-02-09 (Mon, 09 Feb 2026)

  Changed paths:
    M src/kst/org.kde.kst.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: 5280d75f162ab1d716207d0a953bf7f0558640f5
      https://github.com/Kst-plot/kst/commit/5280d75f162ab1d716207d0a953bf7f0558640f5
  Author: Barth Netterfield <barth.netterfield at utoronto.ca>
  Date:   2026-02-09 (Mon, 09 Feb 2026)

  Changed paths:
    M CMakeLists.txt
    M cmake/modules/KstMacros.cmake
    M src/libkst/CMakeLists.txt
    M src/libkstapp/CMakeLists.txt
    M src/libkstmath/CMakeLists.txt
    M src/widgets/CMakeLists.txt

  Log Message:
  -----------
  remove qt_add_ui and replace with autouic based approach.


Compare: https://github.com/Kst-plot/kst/compare/f966dc5ffbed...5280d75f162a

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