Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-12-20 18:56:34 +01:00
Code Releases Activity
5,540 Commits 32 Branches 57 Tags 59 MiB
2da5b68fde
Commit Graph

186 Commits

Author SHA1 Message Date
l10n daemon script
2da5b68fde 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-21 09:04:33 +02:00
l10n daemon script
871a88811d GIT_SILENT made messages (after extraction) 2020-07-21 07:54:23 +02:00
l10n daemon script
641b5350d7 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-20 08:37:34 +02:00
l10n daemon script
11297e33e3 GIT_SILENT made messages (after extraction) 2020-07-20 07:26:20 +02:00
l10n daemon script
3d169e7d61 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-06-18 08:27:29 +02:00
l10n daemon script
ab102f8c13 GIT_SILENT made messages (after extraction) 2020-06-18 07:13:43 +02:00
l10n daemon script
1904226da8 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-06-17 16:50:02 +02:00
l10n daemon script
4511ac8512 GIT_SILENT made messages (after extraction) 2020-06-17 15:34:29 +02:00
l10n daemon script
59d76deec6 GIT_SILENT made messages (after extraction) 2020-04-06 08:50:27 +02:00
l10n daemon script
50c2cebdd6 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-01-13 09:36:25 +01:00
l10n daemon script
3953f3e0bf GIT_SILENT made messages (after extraction) 2020-01-13 08:18:40 +01:00
l10n daemon script
026320183c GIT_SILENT made messages (after extraction) 2019-08-09 07:55:37 +02:00
l10n daemon script
24434a05a7 GIT_SILENT made messages (after extraction) 2019-06-06 07:15:38 +02:00
l10n daemon script
eb3e966363 GIT_SILENT made messages (after extraction) 2019-06-03 07:38:51 +02:00
l10n daemon script
44c85c7f65 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"
 2019-05-30 08:26:40 +02:00
l10n daemon script
8e57d0895c 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"
 2019-05-11 09:01:28 +02:00
l10n daemon script
01f3c3d376 GIT_SILENT made messages (after extraction) 2019-05-11 07:51:53 +02:00
l10n daemon script
c3dce2aa80 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"
 2019-03-21 08:45:27 +01:00
l10n daemon script
9f393fe1ae GIT_SILENT made messages (after extraction) 2019-03-21 07:43:00 +01:00
l10n daemon script
c32b899ae3 GIT_SILENT made messages (after extraction) 2019-02-25 03:15:21 +01:00
l10n daemon script
2860504d6b 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"
 2019-02-24 05:28:07 +01:00
l10n daemon script
9eb11111aa GIT_SILENT made messages (after extraction) 2019-02-09 03:07:15 +01:00
Christoph Cullmann
5bb7e9cfcf Add --wmclass argument to linux completion files 
Reviewers: #falkon, drosca

Reviewed By: #falkon, drosca

Subscribers: cullmann, falkon

Tags: #falkon

Differential Revision: https://phabricator.kde.org/D18667
 2019-02-02 16:24:27 +01:00
l10n daemon script
524697d139 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"
 2019-01-27 05:34:59 +01:00
l10n daemon script
caf1380774 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"
 2019-01-21 05:18:24 +01:00
l10n daemon script
8d321a72bf GIT_SILENT made messages (after extraction) 2019-01-21 03:00:18 +01:00
l10n daemon script
0684603930 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-12-24 05:18:23 +01:00
l10n daemon script
8f6054f788 GIT_SILENT made messages (after extraction) 2018-12-12 03:01:20 +01:00
l10n daemon script
5b831a3c8c GIT_SILENT made messages (after extraction) 2018-11-01 03:43:13 +01:00
l10n daemon script
116ba93b79 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-10-22 05:54:15 +02:00
l10n daemon script
5fb500465f GIT_SILENT made messages (after extraction) 2018-10-22 03:41:47 +02:00
l10n daemon script
b44134fd07 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-10-10 06:19:06 +02:00
l10n daemon script
82417ff4a5 GIT_SILENT made messages (after extraction) 2018-10-10 03:54:18 +02:00
l10n daemon script
e0d1175dd1 GIT_SILENT made messages (after extraction) 2018-08-26 03:34:44 +02:00
l10n daemon script
1500f2202a 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-08-03 05:36:42 +02:00
l10n daemon script
06020d9615 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-03 05:28:07 +02:00
l10n daemon script
1c6f5bd8e2 GIT_SILENT made messages (after extraction) 2018-07-03 03:23:47 +02:00
l10n daemon script
086d572e25 GIT_SILENT made messages (after extraction) 2018-06-26 03:24:35 +02:00
l10n daemon script
0e96dd33c2 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-06-17 05:29:07 +02:00
l10n daemon script
73123c72c2 GIT_SILENT made messages (after extraction) 2018-06-17 03:29:09 +02:00
l10n daemon script
c252de4bdd GIT_SILENT made messages (after extraction) 2018-06-13 03:38:24 +02:00
l10n daemon script
aca4f6c0a9 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-05-16 05:26:16 +02:00
David Rosca
3760a9ffd1
AppImage: Bundle KWindowSystem plugins 2018-05-09 18:11:57 +02:00
David Rosca
68ff092b4c
Update AppImage build Dockerfile 2018-05-07 13:33:52 +02:00
David Rosca
dd8d8b9007
Add Dockerfile for building AppImage 2018-05-01 22:59:49 +02:00
l10n daemon script
e36d092c08 GIT_SILENT made messages (after extraction) 2018-04-27 03:32:10 +02:00
l10n daemon script
dd60458d6a 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-04-24 05:25:10 +02:00
l10n daemon script
75d5f5d552 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-04-21 07:16:56 +02:00
l10n daemon script
08a3fe5476 GIT_SILENT made messages (after extraction) 2018-04-21 06:15:24 +02:00
l10n daemon script
a62fb97ed8 GIT_SILENT made messages (after extraction) 2018-04-17 06:17:22 +02:00