- Committer: l10n daemon script
- Date: 2018-01-15 03:46:14 UTC
- Revision ID: git-v1:a77e4456c0cb662088266d10459221506ede41ad
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
|
1 | 11 years ago | Àlex Fiestas | First import of our providers and services, atm tw |
|
||
|
icons
|
2 | 11 years ago | Àlex Fiestas | Added icons for twitter and identi.ca |
|
||
|
plugins
|
67 | 8 years ago | Martin Klapetek | Merge the owncloud UI plugin from kaccounts-integr |
|
||
|
providers
|
1 | 11 years ago | Àlex Fiestas | First import of our providers and services, atm tw |
|
||
|
services
|
1 | 11 years ago | Àlex Fiestas | First import of our providers and services, atm tw |
|
||
|
webkit-options
|
23 | 10 years ago | Àlex Fiestas | Install signon-ui config file for facebook We hav |
|
||
.arcconfig |
106 | 7 years ago | Elvis Angelaccio | Add .arcconfig | 58 bytes |
|
|
|
CMakeLists.txt |
131 | 6 years ago | Albert Astals Cid | GIT_SILENT Upgrade KDE Applications version to 18. | 1.2 KB |
|
|
|
COPYING |
47 | 9 years ago | Martin Klapetek | Add license files | 17.8 KB |
|
|
Messages.sh |
84.1.6 | 8 years ago | Luigi Toscano | Fix message extraction: restrict to real i18n stri | 239 bytes |
|
|