Commit Graph

37 Commits

Author SHA1 Message Date
l10n daemon script
71b8f9b22d 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-09-09 09:25:38 +00:00
Friedrich W. H. Kossebau
3ec4f26e79 Fix: update wallpaper example Autumn's config.qml to QtQuick.Controls 2016-08-03 23:01:07 +02:00
l10n daemon script
3dac19023c 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-02 10:51:53 +00:00
l10n daemon script
01f4cf59ea 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 17:07:45 +00:00
l10n daemon script
c718ba4b48 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-08-26 10:19:25 +00:00
l10n daemon script
1afbc2c461 SVN_SILENT made messages (.desktop file) 2015-01-02 09:15:04 +00:00
l10n daemon script
53d694072c SVN_SILENT made messages (.desktop file) 2014-12-19 09:15:56 +00:00
l10n daemon script
f64207f408 SVN_SILENT made messages (.desktop file) 2014-12-14 08:54:42 +00:00
l10n daemon script
cf3898f7a9 SVN_SILENT made messages (.desktop file) 2014-12-01 08:51:21 +00:00
l10n daemon script
1a4b23f845 SVN_SILENT made messages (.desktop file) 2014-11-04 10:53:50 +00:00
l10n daemon script
88ccf7be3d SVN_SILENT made messages (.desktop file) 2014-09-22 08:34:39 +00:00
l10n daemon script
edc9eae84b SVN_SILENT made messages (.desktop file) 2014-09-10 08:47:20 +00:00
l10n daemon script
dc61b4d5c2 SVN_SILENT made messages (.desktop file) 2014-09-04 08:36:35 +00:00
l10n daemon script
8afadc6410 SVN_SILENT made messages (.desktop file) 2014-07-10 04:23:58 +00:00
l10n daemon script
ee230c4d21 SVN_SILENT made messages (.desktop file) 2014-07-09 03:37:24 +00:00
l10n daemon script
29908f145a SVN_SILENT made messages (.desktop file) 2014-07-01 12:38:20 +00:00
l10n daemon script
b06bb52100 SVN_SILENT made messages (.desktop file) 2014-06-29 08:42:52 +00:00
l10n daemon script
b092bbed31 SVN_SILENT made messages (.desktop file) 2014-06-12 08:31:04 +00:00
l10n daemon script
fd1674450e SVN_SILENT made messages (.desktop file) 2014-05-25 08:47:48 +00:00
l10n daemon script
db8da9ff8d SVN_SILENT made messages (.desktop file) 2014-05-20 10:48:03 +00:00
l10n daemon script
14ab84f5cc SVN_SILENT made messages (.desktop file) 2014-05-18 08:22:25 +00:00
l10n daemon script
1b3060649c SVN_SILENT made messages (.desktop file) 2014-05-14 08:29:33 +00:00
l10n daemon script
5713f72542 SVN_SILENT made messages (.desktop file) 2014-05-03 08:34:24 +00:00
l10n daemon script
d55335d2a9 SVN_SILENT made messages (.desktop file) 2014-05-02 08:52:44 +00:00
l10n daemon script
238bc54c5b SVN_SILENT made messages (.desktop file) 2014-04-29 10:13:52 +00:00
l10n daemon script
012b0681c9 SVN_SILENT made messages (.desktop file) 2014-04-29 04:51:45 +00:00
l10n daemon script
d2f752597f SVN_SILENT made messages (.desktop file) 2014-04-28 15:59:04 +00:00
l10n daemon script
8fcd320f27 SVN_SILENT made messages (.desktop file) 2014-04-28 12:45:07 +00:00
l10n daemon script
b9130c7c24 SVN_SILENT made messages (.desktop file) 2014-04-28 09:02:00 +00:00
l10n daemon script
880da9b195 SVN_SILENT made messages (.desktop file) 2014-04-28 05:09:56 +00:00
l10n daemon script
dfd425ae82 SVN_SILENT made messages (.desktop file) 2014-04-27 21:04:10 +00:00
l10n daemon script
cbf1e988e9 SVN_SILENT made messages (.desktop file) 2014-04-27 16:44:26 +00:00
l10n daemon script
d149d719a9 SVN_SILENT made messages (.desktop file) 2014-04-27 05:19:59 +00:00
l10n daemon script
16ea0c68f6 SVN_SILENT made messages (.desktop file) 2014-04-19 04:52:27 +00:00
l10n daemon script
709d60a737 SVN_SILENT made messages (.desktop file) 2014-04-18 05:16:48 +00:00
l10n daemon script
130ccfb50d SVN_SILENT made messages (.desktop file) 2013-11-02 03:45:23 +00:00
Marco Martin
3781be8f71 example wallpaper 2013-09-04 11:57:46 +02:00