- Committer: l10n daemon script
- Date: 2018-04-18 03:42:01 UTC
- Revision ID: git-v1:378ad25f9f80290736581f6764d6c9e0b4ec80ed
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 | ||
|---|---|---|---|---|---|---|---|
 ..
|
|||||||
128-apps-kolf.png |
1158.1.19 | 9 years ago | Montel Laurent | Rename icons | 3.7 KB |
|
|
16-apps-kolf.png |
1158.1.19 | 9 years ago | Montel Laurent | Rename icons | 643 bytes |
|
|
22-apps-kolf.png |
1158.1.19 | 9 years ago | Montel Laurent | Rename icons | 591 bytes |
|
|
32-apps-kolf.png |
1158.1.19 | 9 years ago | Montel Laurent | Rename icons | 1.7 KB |
|
|
48-apps-kolf.png |
1158.1.19 | 9 years ago | Montel Laurent | Rename icons | 943 bytes |
|
|
64-apps-kolf.png |
1158.1.19 | 9 years ago | Montel Laurent | Rename icons | 1.3 KB |
|
|
CMakeLists.txt |
1158.1.19 | 9 years ago | Montel Laurent | Rename icons | 190 bytes |
|
|