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

2020-07-15 05:53:43 +02:00

..

CMakeLists.txt

Add a global shortcut (Ctrl+Alt+T) to launch Konsole

2018-06-26 23:21:34 -04:00

konsole.khotkeys

Add a global shortcut (Ctrl+Alt+T) to launch Konsole

2018-06-26 23:21:34 -04:00

konsole.notifyrc

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

2020-07-15 05:53:43 +02:00

konsole.qrc

Don't require dbus + bundle ui files in resources

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

konsolehere.desktop

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

2020-06-20 05:16:04 +02:00

konsolepart.desktop

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

2020-06-20 05:16:04 +02:00

konsolerun.desktop

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

2020-06-20 05:16:04 +02:00

konsoleui.rc

Better accesibility to maximize view

2020-04-13 13:47:50 +00:00

org.kde.konsole.appdata.xml

GIT_SILENT Update Appstream for new release

2020-07-03 22:53:13 +02:00

org.kde.konsole.desktop

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

2020-06-20 05:16:04 +02:00

partui.rc

Hide unused actions instead of disabling them

2020-07-02 12:05:05 +02:00

sessionui.rc

Hide unused actions instead of disabling them

2020-07-02 12:05:05 +02:00

terminalemulator.desktop

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

2020-06-20 05:16:04 +02:00