| Age | Commit message (Collapse) | Author | |
|---|---|---|---|
| 2016-03-21 | SVN_SILENT made messages (.desktop file) - always resolve ours | l10n daemon script | |
| 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 | SVN_SILENT made messages (.desktop file) - always resolve ours | l10n daemon script | |
| 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 | SVN_SILENT made messages (.desktop file) - always resolve ours | l10n daemon script | |
| 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 | SVN_SILENT made messages (.desktop file) - always resolve ours | l10n daemon script | |
| 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-14 | Merge branch 'Applications/15.12' | Frank Reininghaus | |
| 2016-01-10 | SVN_SILENT made messages (.desktop file) | l10n daemon script | |
| 2015-12-30 | SVN_SILENT made messages (.desktop file) | l10n daemon script | |
| 2015-12-30 | SVN_SILENT made messages (.desktop file) - always resolve ours | l10n daemon script | |
| 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 | SVN_SILENT made messages (.desktop file) - always resolve ours | l10n daemon script | |
| 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 | SVN_SILENT made messages (.desktop file) | l10n daemon script | |
| 2015-12-08 | SVN_SILENT made messages (.desktop file) - always resolve ours | l10n daemon script | |
| 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 | SVN_SILENT made messages (.desktop file) - always resolve ours | l10n daemon script | |
| 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 | SVN_SILENT made messages (.desktop file) - always resolve ours | l10n daemon script | |
| 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-29 | Merge remote-tracking branch 'origin/Applications/15.12' | Albert Astals Cid | |
| 2015-11-17 | SVN_SILENT made messages (.desktop file) - always resolve ours | l10n daemon script | |
| 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-16 | SVN_SILENT made messages (.desktop file) | l10n daemon script | |
| 2015-11-04 | SVN_SILENT made messages (.desktop file) - always resolve ours | l10n daemon script | |
| 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 | SVN_SILENT made messages (.desktop file) - always resolve ours | l10n daemon script | |
| 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 | SVN_SILENT made messages (.desktop file) - always resolve ours | l10n daemon script | |
| 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 | SVN_SILENT made messages (.desktop file) - always resolve ours | l10n daemon script | |
| 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 | SVN_SILENT made messages (.desktop file) - always resolve ours | l10n daemon script | |
| 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 | SVN_SILENT made messages (.desktop file) - always resolve ours | l10n daemon script | |
| 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 | SVN_SILENT made messages (.desktop file) - always resolve ours | l10n daemon script | |
| 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 | SVN_SILENT made messages (.desktop file) - always resolve ours | l10n daemon script | |
| 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 | SVN_SILENT made messages (.desktop file) - always resolve ours | l10n daemon script | |
| 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 | SVN_SILENT made messages (.desktop file) - always resolve ours | l10n daemon script | |
| 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 | SVN_SILENT made messages (.desktop file) - always resolve ours | l10n daemon script | |
| 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 | SVN_SILENT made messages (.desktop file) - always resolve ours | l10n daemon script | |
| 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 | SVN_SILENT made messages (.desktop file) - always resolve ours | l10n daemon script | |
| 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 | SVN_SILENT made messages (.desktop file) - always resolve ours | l10n daemon script | |
| 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 | SVN_SILENT made messages (.desktop file) - always resolve ours | l10n daemon script | |
| 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-12 | SVN_SILENT made messages (.desktop file) | l10n daemon script | |
| 2015-03-11 | SVN_SILENT made messages (.desktop file) | l10n daemon script | |
| 2015-03-10 | SVN_SILENT made messages (.desktop file) | l10n daemon script | |
| 2015-03-09 | SVN_SILENT made messages (.desktop file) | l10n daemon script | |
| 2015-03-08 | SVN_SILENT made messages (.desktop file) | l10n daemon script | |
| 2015-03-07 | SVN_SILENT made messages (.desktop file) | l10n daemon script | |
| 2015-03-06 | SVN_SILENT made messages (.desktop file) | l10n daemon script | |
| 2014-12-26 | SVN_SILENT made messages (.desktop file) | l10n daemon script | |
| 2014-12-25 | SVN_SILENT made messages (.desktop file) | l10n daemon script | |
| 2014-10-12 | SVN_SILENT made messages (.desktop file) | l10n daemon script | |
| 2014-07-25 | SVN_SILENT made messages (.desktop file) | l10n daemon script | |
| 2014-07-24 | SVN_SILENT made messages (.desktop file) | l10n daemon script | |
| 2014-07-16 | SVN_SILENT made messages (.desktop file) | l10n daemon script | |
| 2014-06-09 | SVN_SILENT made messages (.desktop file) | l10n daemon script | |
| 2014-02-27 | SVN_SILENT made messages (.desktop file) | l10n daemon script | |
| 2014-01-22 | SVN_SILENT made messages (.desktop file) | l10n daemon script | |
| 2013-08-15 | SVN_SILENT made messages (.desktop file) | l10n daemon script | |
| 2013-08-04 | SVN_SILENT made messages (.desktop file) | l10n daemon script | |
| 2013-03-15 | SVN_SILENT made messages (.desktop file) | Script Kiddy | |
