kde/dolphin
kde/dolphin
1
0
Fork 0
mirror of https://invent.kde.org/system/dolphin synced 2024-11-05 18:47:12 +00:00
Code Issues Projects Releases Packages Wiki Activity
5773 commits 142 branches 326 tags 212 MiB
Commit graph

262 commits

Author SHA1 Message Date
l10n daemon script
52c019c9cb 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-28 05:21:42 +01:00
l10n daemon script
1873e2f08f 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-06 05:25:48 +01:00
l10n daemon script
a8bd6f4b1f 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-05 05:34:15 +02:00
l10n daemon script
90e1cc9c03 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-30 05:25:52 +02:00
l10n daemon script
c2f6e5d669 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-01-09 04:56:51 +01:00
l10n daemon script
c0e6342b7f 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"
 2017-12-20 07:02:02 +01:00
l10n daemon script
4d9c396a98 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"
 2017-05-25 04:21:54 +02:00
l10n daemon script
c1eeb0e115 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"
 2017-01-13 05:50:46 +01:00
l10n daemon script
ae935d36b1 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"
 2016-12-20 12:38:21 +01:00
l10n daemon script
82cfc125f4 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"
 2016-10-10 09:41:54 +00:00
l10n daemon script
50e366431d 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"
 2016-08-19 09:28:24 +00:00
l10n daemon script
82af09127d 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"
 2016-05-29 09:27:44 +00:00
l10n daemon script
32db592309 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"
 2016-03-21 10:58:51 +00:00
l10n daemon script
20cb1492e7 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"
 2016-02-19 09:23:18 +00:00
l10n daemon script
3b8623b040 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"
 2016-01-20 12:38:42 +00:00
l10n daemon script
b336066e1d 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"
 2016-01-15 09:54:42 +00:00
Frank Reininghaus
0743843ebb Merge branch 'Applications/15.12' 2016-01-14 20:41:32 +01:00
l10n daemon script
508ad6cbd0 SVN_SILENT made messages (.desktop file) 2016-01-10 14:42:09 +00:00
l10n daemon script
ce14d709c7 SVN_SILENT made messages (.desktop file) 2015-12-30 12:12:44 +00:00
l10n daemon script
889a574fcd 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"
 2015-12-30 09:19:37 +00:00
l10n daemon script
2d8448f88d 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"
 2015-12-09 09:04:05 +00:00
l10n daemon script
4b97e6fc80 SVN_SILENT made messages (.desktop file) 2015-12-08 12:50:49 +00:00
l10n daemon script
c0d5537afb 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"
 2015-12-08 10:05:01 +00:00
l10n daemon script
0fc2c24039 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"
 2015-12-07 10:14:12 +00:00
l10n daemon script
d3c9d3c31f 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"
 2015-11-30 10:26:25 +00:00
Albert Astals Cid
090f3e90ea Merge remote-tracking branch 'origin/Applications/15.12' 2015-11-29 19:32:15 +01:00
l10n daemon script
e0dfcb9e1d 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"
 2015-11-17 12:50:56 +00:00
l10n daemon script
c4f3c40b83 SVN_SILENT made messages (.desktop file) 2015-11-16 13:50:57 +00:00
l10n daemon script
bc8f3373fd 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"
 2015-11-04 16:55:32 +00:00
l10n daemon script
7b273bb4c6 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"
 2015-11-01 10:40:09 +00:00
l10n daemon script
07dae709d9 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"
 2015-10-26 10:04:54 +00:00
l10n daemon script
c9770e6083 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"
 2015-09-08 12:47:01 +00:00
l10n daemon script
d1871eb1b8 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"
 2015-07-26 19:57:51 +00:00
l10n daemon script
da7a6a16f8 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"
 2015-06-24 10:34:19 +00:00
l10n daemon script
a8a4981b2c 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"
 2015-06-16 13:31:20 +00:00
l10n daemon script
1c1efb983c 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"
 2015-06-04 11:19:31 +00:00
l10n daemon script
8b12612bbf 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"
 2015-05-13 11:01:45 +00:00
l10n daemon script
c1a2c0f1a7 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"
 2015-05-05 14:00:14 +00:00
l10n daemon script
f1c5cd302a 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"
 2015-05-04 10:09:13 +00:00
l10n daemon script
06776451a7 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"
 2015-04-26 09:44:42 +00:00
l10n daemon script
0daae53367 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"
 2015-04-24 09:52:38 +00:00
l10n daemon script
4e96b1a42f 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"
 2015-04-04 11:02:00 +00:00
l10n daemon script
a7484d2ce5 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"
 2015-03-15 09:54:53 +00:00
l10n daemon script
5d115201af SVN_SILENT made messages (.desktop file) 2015-03-12 10:17:33 +00:00
l10n daemon script
157df4b4a6 SVN_SILENT made messages (.desktop file) 2015-03-11 09:43:09 +00:00
l10n daemon script
5431aff4df SVN_SILENT made messages (.desktop file) 2015-03-10 13:14:42 +00:00
l10n daemon script
6b760e926d SVN_SILENT made messages (.desktop file) 2015-03-09 09:36:36 +00:00
l10n daemon script
42e52a1eea SVN_SILENT made messages (.desktop file) 2015-03-08 09:41:37 +00:00
l10n daemon script
06bd36e225 SVN_SILENT made messages (.desktop file) 2015-03-07 10:01:52 +00:00
l10n daemon script
51181dad2b SVN_SILENT made messages (.desktop file) 2015-03-06 04:32:04 +00:00