~neon/kompare/master

  • Committer: l10n daemon script
  • Date: 2021-01-05 05:38:11 UTC
  • Revision ID: git-v1:adc74bb1271af30811340bc01341538a08bdbf94
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"
Filename Latest Rev Last Changed Committer Comment Size
..
app 1027 3 years ago Friedrich W. H. Kossebau Reorganize sources into src/ subfolder NO_CHANGEL Diff
dialogpages 1027 3 years ago Friedrich W. H. Kossebau Reorganize sources into src/ subfolder NO_CHANGEL Diff
icons 1027 3 years ago Friedrich W. H. Kossebau Reorganize sources into src/ subfolder NO_CHANGEL Diff
interfaces 1027 3 years ago Friedrich W. H. Kossebau Reorganize sources into src/ subfolder NO_CHANGEL Diff
komparenavtreepart 1027 3 years ago Friedrich W. H. Kossebau Reorganize sources into src/ subfolder NO_CHANGEL Diff
komparepart 1027 3 years ago Friedrich W. H. Kossebau Reorganize sources into src/ subfolder NO_CHANGEL Diff
servicemenus 1027 3 years ago Friedrich W. H. Kossebau Reorganize sources into src/ subfolder NO_CHANGEL Diff
CMakeLists.txt 1027 3 years ago Friedrich W. H. Kossebau Reorganize sources into src/ subfolder NO_CHANGEL 578 bytes Diff Download File
komparenavigationpart.desktop 1027 3 years ago Friedrich W. H. Kossebau Reorganize sources into src/ subfolder NO_CHANGEL 108 bytes Diff Download File
kompareviewpart.desktop 1027 3 years ago Friedrich W. H. Kossebau Reorganize sources into src/ subfolder NO_CHANGEL 102 bytes Diff Download File
Messages.sh 1027 3 years ago Friedrich W. H. Kossebau Reorganize sources into src/ subfolder NO_CHANGEL 132 bytes Diff Download File