l10n daemon script
|
3c628b921e
|
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-20 05:39:37 +02:00 |
|
l10n daemon script
|
c98ed27c73
|
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:50:31 +02:00 |
|
l10n daemon script
|
08cc1d8754
|
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-30 05:50:59 +02:00 |
|
l10n daemon script
|
55e692fa53
|
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-16 05:37:17 +02:00 |
|
l10n daemon script
|
ff7b037422
|
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-08 05:55:04 +02:00 |
|
l10n daemon script
|
b58419fb50
|
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-07 05:47:03 +02:00 |
|
l10n daemon script
|
4fd02993ea
|
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-19 05:11:15 +01:00 |
|
l10n daemon script
|
43831d9181
|
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-05 05:03:29 +01:00 |
|
l10n daemon script
|
5f485b434f
|
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-29 04:45:56 +01:00 |
|
l10n daemon script
|
c1acf75d7b
|
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-10-24 05:15:41 +02:00 |
|
l10n daemon script
|
812c61c5ff
|
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-09-27 09:12:08 +02:00 |
|
l10n daemon script
|
79c177f94c
|
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-09-12 04:55:15 +02:00 |
|
l10n daemon script
|
51f9dcce9f
|
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-09-11 04:59:00 +02:00 |
|
l10n daemon script
|
56cb796dd5
|
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-09-05 04:31:55 +02:00 |
|
l10n daemon script
|
2833c07797
|
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-09-04 04:45:43 +02:00 |
|
l10n daemon script
|
69d9780315
|
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-09-02 04:54:36 +02:00 |
|
l10n daemon script
|
894d498940
|
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-09-01 04:40:26 +02:00 |
|
Marco Martin
|
e20569d1fd
|
Revert "remove quicksettings applet"
This reverts commit f6419fc9d4.
|
2017-08-30 18:52:43 +02:00 |
|
Marco Martin
|
f6419fc9d4
|
remove quicksettings applet
not used anymore since ages
|
2015-10-27 13:00:51 +01:00 |
|
Marco Martin
|
fe4ad093ec
|
add a native interface to execute command
and do the needed hw related things
|
2015-04-11 16:50:26 +02:00 |
|