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