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

2018-07-01 05:36:52 +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

2018-07-01 05:36:52 +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

2018-03-31 05:14:31 +02:00

konsolepart.desktop

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

2018-06-06 05:34:16 +02:00

konsolerun.desktop

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

2018-06-06 05:34:16 +02:00

konsoleui.rc

Adjust the relative order between actions

2012-02-17 22:06:58 +08:00

org.kde.konsole.appdata.xml

GIT_SILENT made messages (after extraction)

2018-06-22 03:18:15 +02:00

org.kde.konsole.desktop

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

2018-06-06 05:34:16 +02:00

partui.rc

Konsole: Add read-only mode

2018-03-06 10:28:26 -05:00

sessionui.rc

Konsole: Add read-only mode

2018-03-06 10:28:26 -05:00

terminalemulator.desktop

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

2018-06-06 05:34:16 +02:00