- Committer: l10n daemon script
- Date: 2017-10-24 03:04:19 UTC
- Revision ID: git-v1:05676493808bbfafbc867392c541f799c8e25779
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 | ||
|---|---|---|---|---|---|---|---|
 .. |
|||||||
activeshellpackage
|
2914 | 9 years ago | Sebastian Kügler | Merge frameworks into master |
|
||
|
activetoolbox
|
2948 | 9 years ago | Marco Martin | remove unused qmlpackages folder |
|
||
|
applets
|
1 | 14 years ago | Alexis Ménard | Add a Plasma shell for mobile phone. Build deacti |
|
||
|
applications
|
1570 | 12 years ago | Aaron Seigo | move browser into applications |
|
||
|
components
|
1477 | 12 years ago | Aaron Seigo | move bindings/mobilecomponents to just components/ |
|
||
|
containments
|
29 | 14 years ago | Alexis Ménard | Move the research stuff into the main project. sv |
|
||
|
dataengines
|
832 | 13 years ago | Sebastian Kügler | Web preview dataengine Small, functional and easy |
|
||
|
runners
|
2452 | 12 years ago | Aaron Seigo | introduce a runner for active apps listings this |
|
||
.arcconfig |
3002 | 8 years ago | Marco Martin | add an arcconfig | 78 bytes |
|
|
|
.debug |
2199.1.1 | 12 years ago | Ivan Čukić | The first version of the location chooser applet | Empty |
|
|
|
CMakeLists.txt |
3102 | 6 years ago | Volker Krause | Port away from KDELibs4Support Reviewers: bshah | 2 KB |
|
|
|
LICENSE.GPL-2 |
1621.1.112 | 12 years ago | Philip Muskovac | Add copies of the GPL-2, LGPL-2 and LGPL-2.1 as r | 17.6 KB |
|
|
|
LICENSE.LGPL-2 |
1621.1.112 | 12 years ago | Philip Muskovac | Add copies of the GPL-2, LGPL-2 and LGPL-2.1 as r | 24.7 KB |
|
|
|
LICENSE.LGPL-2.1 |
1621.1.112 | 12 years ago | Philip Muskovac | Add copies of the GPL-2, LGPL-2 and LGPL-2.1 as r | 25.9 KB |
|
|