alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
14,086 Commits 1 Branch 0 Tags 40 MiB
13dc03991d
Commit Graph

248 Commits

Author SHA1 Message Date
l10n daemon script
13dc03991d 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"
 2016-02-06 09:49:14 +00:00
l10n daemon script
087c10cd43 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"
 2016-02-05 09:18:18 +00:00
l10n daemon script
3dac19023c 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"
 2016-02-02 10:51:53 +00:00
l10n daemon script
e965b8c647 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"
 2016-01-26 10:21:15 +00:00
l10n daemon script
bd10d78e1e 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"
 2016-01-22 09:52:02 +00:00
l10n daemon script
3908c521ca 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"
 2016-01-13 10:35:10 +00:00
l10n daemon script
345fba11bf 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"
 2015-12-30 09:28:22 +00:00
l10n daemon script
a1feac929b 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"
 2015-12-16 09:05:14 +00:00
l10n daemon script
9d96277a5e 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"
 2015-12-09 09:05:50 +00:00
l10n daemon script
4a6cc3319e 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"
 2015-12-08 10:05:59 +00:00
l10n daemon script
3c90a5d835 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"
 2015-12-07 10:15:57 +00:00
l10n daemon script
8d9fd0846a 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"
 2015-12-06 09:14:26 +00:00
l10n daemon script
26ca3e43b2 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"
 2015-12-05 09:08:31 +00:00
l10n daemon script
8a21e2bb27 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"
 2015-12-04 09:12:31 +00:00
l10n daemon script
67a6976f8c 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"
 2015-12-03 09:40:56 +00:00
Sebastian Kügler
16b3124578 Don't install plasmoid for now 
This may get in the way of users copying it and forgetting to change the
plugin name. The dev guide assumes manual installation anyway.
 2015-12-03 02:45:04 +01:00
Sebastian Kügler
b2d4f3a6bc Add basic plasmoid as example for developerguide 2015-12-03 02:45:04 +01:00
l10n daemon script
4519c25d5c 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"
 2015-11-10 12:46:43 +00:00
l10n daemon script
01f4cf59ea 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"
 2015-11-04 17:07:45 +00:00
l10n daemon script
b4a42d3616 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"
 2015-10-26 10:07:41 +00:00
andreas kainz
6c20f17af9 Breeze Icon: add widget icon to notes 2015-10-12 11:41:42 +02:00
l10n daemon script
98583160cb 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"
 2015-08-28 10:20:30 +00:00
l10n daemon script
c718ba4b48 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"
 2015-08-26 10:19:25 +00:00
l10n daemon script
a5ff979996 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"
 2015-08-10 10:12:53 +00:00
l10n daemon script
a989a77a0d 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"
 2015-06-03 10:14:00 +00:00
l10n daemon script
9ea35bd26d 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"
 2015-05-27 10:14:57 +00:00
l10n daemon script
81ec3e0d58 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"
 2015-05-16 11:30:30 +00:00
l10n daemon script
a48529b3c8 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"
 2015-05-01 10:21:06 +00:00
l10n daemon script
4207218d8b 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"
 2015-04-26 09:45:20 +00:00
l10n daemon script
7897780310 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"
 2015-04-18 10:26:53 +00:00
l10n daemon script
505c1f8cba 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"
 2015-04-07 13:16:44 +00:00
l10n daemon script
b7e5392a7b 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"
 2015-03-19 09:50:52 +00:00
l10n daemon script
104f37b8c8 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"
 2015-03-16 10:11:21 +00:00
l10n daemon script
5265842028 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"
 2015-03-14 10:19:38 +00:00
l10n daemon script
e44eb9edec SVN_SILENT made messages (.desktop file) 2015-02-27 11:41:25 +00:00
l10n daemon script
073b83b440 SVN_SILENT made messages (.desktop file) 2015-02-16 10:17:17 +00:00
l10n daemon script
03bae89ac5 SVN_SILENT made messages (.desktop file) 2015-02-04 08:58:49 +00:00
l10n daemon script
8fb6f677dd SVN_SILENT made messages (.desktop file) 2015-01-29 09:16:20 +00:00
l10n daemon script
4b1970cf83 SVN_SILENT made messages (.desktop file) 2015-01-27 11:23:41 +00:00
l10n daemon script
fb4932bf3c SVN_SILENT made messages (.desktop file) 2015-01-26 09:01:51 +00:00
l10n daemon script
b46bd92d0d SVN_SILENT made messages (.desktop file) 2015-01-21 08:54:32 +00:00
Kevin Funk
9dda1204c8 Run convert-to-cmake-automoc.pl over files 2015-01-20 00:00:31 +01:00
l10n daemon script
65f867b152 SVN_SILENT made messages (.desktop file) 2015-01-19 08:58:56 +00:00
l10n daemon script
d255c63ce2 SVN_SILENT made messages (.desktop file) 2015-01-13 11:36:35 +00:00
Alex Merry
48e9c2f29e Update installation variables. 2015-01-10 17:47:31 +00:00
Elias Probst
2f2e7ca0f1
Deprecate kservice_desktop_to_json(), use kcoreaddons_desktop_to_json(). 
REVIEW: 121958
 2015-01-09 20:49:12 +01:00
l10n daemon script
41777ed685 SVN_SILENT made messages (.desktop file) 2015-01-06 10:55:19 +00:00
l10n daemon script
050c7707bf SVN_SILENT made messages (.desktop file) 2015-01-03 09:14:08 +00:00
l10n daemon script
1afbc2c461 SVN_SILENT made messages (.desktop file) 2015-01-02 09:15:04 +00:00
l10n daemon script
6f7a3ae9ea SVN_SILENT made messages (.desktop file) 2014-12-30 10:48:32 +00:00