~blue-shell/blue-shell/flickr-runner

  • Committer: l10n daemon script
  • Date: 2018-05-18 00:13:17 UTC
  • Revision ID: git-v1:9ecd29f3553a991853e68dc1c9fb08bace841e83
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
..
cmake 2 12 years ago Shaun Reich fix build issues (adding cmake file) Diff
CMakeLists.txt 2 12 years ago Shaun Reich fix build issues (adding cmake file) 955 bytes Diff Download File
COPYING.LIB 4 12 years ago Shaun Reich add COPYING.lib 25.9 KB Diff Download File
flickjob.cpp 3 12 years ago Shaun Reich flickr works! i want to download a thumbnail, but 2.4 KB Diff Download File
flickjob.h 5 12 years ago Shaun Reich fix email addy 1.7 KB Diff Download File
flickr.cpp 3 12 years ago Shaun Reich flickr works! i want to download a thumbnail, but 4.1 KB Diff Download File
flickr.h 5 12 years ago Shaun Reich fix email addy 2 KB Diff Download File
imageiconengine.cpp 1 12 years ago Shaun Reich flickr runner, initial code drop 1.8 KB Diff Download File
imageiconengine.h 1 12 years ago Shaun Reich flickr runner, initial code drop 1.2 KB Diff Download File
File Messages.sh 1 12 years ago Shaun Reich flickr runner, initial code drop 72 bytes Diff Download File
plasma-runner-flickr.desktop 30 6 years ago l10n daemon script SVN_SILENT made messages (.desktop file) - always 1.7 KB Diff Download File