- 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 |
472 | 6 years ago | Jan Grulich | Attempt to fix the build one more time | 485 bytes |
|
|
|
configsavetest.cpp |
452.1.7 | 6 years ago | Aleix Pol | Revert "Revert "Make the kde-gtk-config kcm better | 2.7 KB |
|
|
|
configsavetest.h |
452.1.7 | 6 years ago | Aleix Pol | Revert "Revert "Make the kde-gtk-config kcm better | 279 bytes |
|
|