- Committer: l10n daemon script
- Date: 2019-03-24 04:30:47 UTC
- Revision ID: git-v1:f25048bb3dcf347bf34266ee22b4525ca6c94966
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"
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"
| Filename | Latest Rev | Last Changed | Committer | Comment | Size | ||
|---|---|---|---|---|---|---|---|
 ..
|
|||||||
CMakeLists.txt |
443 | 6 years ago | Aleix Pol | Fix look-up of gtk preview modules BUG: 383198 | 596 bytes |
|
|
|
preview3.c |
475 | 6 years ago | Kai Uwe Broulik | Merge branch 'Plasma/5.11' | 3.2 KB |
|
|