l10n daemon script
|
fc2bd97e69
|
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:54:36 +00:00 |
|
l10n daemon script
|
0145c837db
|
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-11 10:30:30 +00:00 |
|
l10n daemon script
|
d9c8a7865e
|
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-07 21:12:54 +00:00 |
|
l10n daemon script
|
e424bcec1a
|
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:00:05 +00:00 |
|
l10n daemon script
|
5b712ef7c9
|
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:41:45 +00:00 |
|
l10n daemon script
|
633952b638
|
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-27 12:30:00 +00:00 |
|
l10n daemon script
|
dda5ec5385
|
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 03:37:32 +00:00 |
|
l10n daemon script
|
4239b0525b
|
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-25 03:57:27 +00:00 |
|
l10n daemon script
|
c0576f76b1
|
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-13 12:45:08 +00:00 |
|
l10n daemon script
|
c4a499ca01
|
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-12 10:38:12 +00:00 |
|
l10n daemon script
|
1a464d6384
|
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-06 12:36:45 +00:00 |
|
l10n daemon script
|
9f291d9ef7
|
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-02 10:15:24 +00:00 |
|
l10n daemon script
|
47ee991548
|
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-01 10:36:43 +00:00 |
|
l10n daemon script
|
b05a90f090
|
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-28 10:20:36 +00:00 |
|
l10n daemon script
|
d42bcb25a2
|
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-19 11:56:19 +00:00 |
|
l10n daemon script
|
d33800a748
|
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-17 11:59:25 +00:00 |
|
l10n daemon script
|
c1c1166e09
|
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-16 10:24:01 +00:00 |
|
l10n daemon script
|
42a3029b0e
|
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-14 10:22:08 +00:00 |
|
l10n daemon script
|
933cbd5bfd
|
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-13 10:31:01 +00:00 |
|
Aleix Pol
|
27302c0450
|
Improve RunCommand configuration display
|
2015-09-12 13:51:15 +02:00 |
|
Aleix Pol
|
f25dc109f3
|
Don't lock the daemon when running a process is started
|
2015-09-12 13:51:15 +02:00 |
|
Albert Vaca
|
0f280b5345
|
Made the runcommands plugin re-send the config when it changes
|
2015-09-12 04:50:20 -07:00 |
|
Aleix Pol
|
cfe0e60eb9
|
Remove wrong include
|
2015-09-12 12:49:43 +02:00 |
|
Albert Vaca
|
cf4a9b8639
|
First implementation of runcommand plugin
|
2015-09-12 03:38:44 -07:00 |
|