~neon/kdiamond/master

  • Committer: l10n daemon script
  • Date: 2020-06-18 03:33:05 UTC
  • Revision ID: git-v1:c82a870124fbd6624e66ccdbfd5a8a34f1df3654
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
..
doc 94 16 years ago Stefan Majewsky KDiamond documentation. (Did not work last time do Diff
sounds 140 15 years ago Eugene Trounev Added sounds to some of the games. More sounds to Diff
src 1 16 years ago Stefan Majewsky Import of KDiamond, a three-in-a-row game, in vers Diff
themes 1 16 years ago Stefan Majewsky Import of KDiamond, a three-in-a-row game, in vers Diff
.gitignore 573 4 years ago Laurent Montel GIT_SILENT: ignore .cmake generated by qtc 54 bytes Diff Download File
CMakeLists.txt 571 4 years ago Laurent Montel Merge remote-tracking branch 'origin/release/20.04 1.4 KB Diff Download File
COPYING 419 11 years ago Wolfgang Rohdewald add COPYING with gplv2 and/or COPYING.DOC v1.2 17.6 KB Diff Download File
COPYING.DOC 419 11 years ago Wolfgang Rohdewald add COPYING with gplv2 and/or COPYING.DOC v1.2 19.9 KB Diff Download File
logo.png 578 3 years ago Yuri Chornoivan GIT_SILENT: add KDiamond icon as repository logo 2.9 KB Diff Download File