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

2022-09-16 01:47:29 +00:00

..

CMakeLists.txt

Adapt build system to building with Qt5 and Qt6

2022-06-01 14:35:49 +00:00

konsole.notifyrc

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

2022-09-05 01:45:39 +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

2022-09-05 01:45:39 +00:00

konsolerun.desktop

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

2022-09-05 01:45:39 +00:00

konsoleui.rc

Be able to resize the splits to the same size.

2022-05-23 14:50:05 +00:00

org.kde.konsole.appdata.xml

GIT_SILENT made messages (after extraction)

2022-09-11 00:48:37 +00:00

org.kde.konsole.desktop

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

2022-09-16 01:47:29 +00:00

partui.rc

add action to disable/enable mouse tracking

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

sessionui.rc

Allow filtered copy to clipboard

2022-07-03 07:58:54 +00:00

terminalemulator.desktop

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

2022-09-05 01:45:39 +00:00