- Committer: l10n daemon script
- Date: 2019-04-16 04:05:25 UTC
- Revision ID: git-v1:a0c7ecc9f00dff57b85abd7a36ed8d6f19773ed0
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 |
470 | 6 years ago | Jan Grulich | Fix build When building gtk2 based stuff we need | 677 bytes |
|
|
|
preview.c |
443 | 6 years ago | Aleix Pol | Fix look-up of gtk preview modules BUG: 383198 | 3.9 KB |
|
|
|
preview.ui |
101 | 12 years ago | Aleix Pol | Rename gtkreload directory to gtkproxies. | 33.9 KB |
|
|
|
reload.c |
186 | 12 years ago | Aleix Pol | change my e-mail account in the copyright to my wo | 2 KB |
|
|