l10n daemon script ad481ce2a7 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"

2023-12-24 02:33:13 +00:00

..

CMakeLists.txt

move konsole to kf6

2023-10-25 22:13:53 +05:00

konsole.notifyrc

SVN_SILENT made messages (.desktop file) - always resolve ours

2023-12-24 02:33:13 +00:00

konsole.qrc

Don't require dbus + bundle ui files in resources

2016-06-18 22:35:40 +02:00

konsolepart.desktop

SVN_SILENT made messages (.desktop file) - always resolve ours

2023-12-24 02:33:13 +00:00

konsolerun.desktop

SVN_SILENT made messages (.desktop file) - always resolve ours

2023-10-29 02:19:50 +00:00

konsoleui.rc

Bump konsoleui.rc version number.

2023-01-27 18:07:35 +02:00

org.kde.konsole.appdata.xml

GIT_SILENT made messages (after extraction)

2023-12-10 02:00:21 +00:00

org.kde.konsole.desktop

SVN_SILENT made messages (.desktop file) - always resolve ours

2023-12-24 02:33:13 +00:00

partui.rc

add action to disable/enable mouse tracking

2021-11-24 14:55:00 +00:00

sessionui.rc

Add a menu option for monitors to only notify once.

2023-05-14 14:15:19 +00:00

terminalemulator.desktop

SVN_SILENT made messages (.desktop file) - always resolve ours

2023-12-24 02:33:13 +00:00