Commit Graph

46 Commits

Author SHA1 Message Date
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
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
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
03bae89ac5 SVN_SILENT made messages (.desktop file) 2015-02-04 08:58:49 +00:00
l10n daemon script
1afbc2c461 SVN_SILENT made messages (.desktop file) 2015-01-02 09:15:04 +00:00
l10n daemon script
f64207f408 SVN_SILENT made messages (.desktop file) 2014-12-14 08:54:42 +00:00
l10n daemon script
d47e417e40 SVN_SILENT made messages (.desktop file) 2014-12-07 08:47:50 +00:00
l10n daemon script
cf3898f7a9 SVN_SILENT made messages (.desktop file) 2014-12-01 08:51:21 +00:00
l10n daemon script
43049221ab SVN_SILENT made messages (.desktop file) 2014-11-12 08:52:06 +00:00
l10n daemon script
150f24b30c SVN_SILENT made messages (.desktop file) 2014-10-27 08:35:46 +00:00
l10n daemon script
4a4e3dc526 SVN_SILENT made messages (.desktop file) 2014-10-23 08:55:08 +00:00
l10n daemon script
edc9eae84b SVN_SILENT made messages (.desktop file) 2014-09-10 08:47:20 +00:00
l10n daemon script
dc61b4d5c2 SVN_SILENT made messages (.desktop file) 2014-09-04 08:36:35 +00:00
l10n daemon script
8afadc6410 SVN_SILENT made messages (.desktop file) 2014-07-10 04:23:58 +00:00
l10n daemon script
b06bb52100 SVN_SILENT made messages (.desktop file) 2014-06-29 08:42:52 +00:00
l10n daemon script
ac4f519188 SVN_SILENT made messages (.desktop file) 2014-06-23 08:35:39 +00:00
l10n daemon script
b092bbed31 SVN_SILENT made messages (.desktop file) 2014-06-12 08:31:04 +00:00
l10n daemon script
5ab5d89fea SVN_SILENT made messages (.desktop file) 2014-06-07 08:25:46 +00:00
l10n daemon script
fd1674450e SVN_SILENT made messages (.desktop file) 2014-05-25 08:47:48 +00:00
l10n daemon script
db8da9ff8d SVN_SILENT made messages (.desktop file) 2014-05-20 10:48:03 +00:00
l10n daemon script
1b3060649c SVN_SILENT made messages (.desktop file) 2014-05-14 08:29:33 +00:00
l10n daemon script
5713f72542 SVN_SILENT made messages (.desktop file) 2014-05-03 08:34:24 +00:00
l10n daemon script
d55335d2a9 SVN_SILENT made messages (.desktop file) 2014-05-02 08:52:44 +00:00
Sebastian Kügler
28cd2a54a3 Fix shader example 2014-05-01 21:25:13 +02:00
l10n daemon script
238bc54c5b SVN_SILENT made messages (.desktop file) 2014-04-29 10:13:52 +00:00
l10n daemon script
012b0681c9 SVN_SILENT made messages (.desktop file) 2014-04-29 04:51:45 +00:00
l10n daemon script
d2f752597f SVN_SILENT made messages (.desktop file) 2014-04-28 15:59:04 +00:00
l10n daemon script
8fcd320f27 SVN_SILENT made messages (.desktop file) 2014-04-28 12:45:07 +00:00
l10n daemon script
b9130c7c24 SVN_SILENT made messages (.desktop file) 2014-04-28 09:02:00 +00:00
l10n daemon script
880da9b195 SVN_SILENT made messages (.desktop file) 2014-04-28 05:09:56 +00:00
l10n daemon script
dfd425ae82 SVN_SILENT made messages (.desktop file) 2014-04-27 21:04:10 +00:00
l10n daemon script
cbf1e988e9 SVN_SILENT made messages (.desktop file) 2014-04-27 16:44:26 +00:00
l10n daemon script
d149d719a9 SVN_SILENT made messages (.desktop file) 2014-04-27 05:19:59 +00:00
l10n daemon script
16ea0c68f6 SVN_SILENT made messages (.desktop file) 2014-04-19 04:52:27 +00:00
l10n daemon script
709d60a737 SVN_SILENT made messages (.desktop file) 2014-04-18 05:16:48 +00:00
Marco Martin
91642b0868 qtextracomponents->kquickcontrolsaddons 2014-03-25 17:10:25 +01:00
l10n daemon script
c802da22a5 SVN_SILENT made messages (.desktop file) 2014-02-23 04:51:11 +00:00
Marco Martin
3858044d25 Merge branch 'mart/AppletAttached'
Conflicts:
	src/declarativeimports/core/dialog.cpp
	src/scriptengines/qml/plasmoid/containmentinterface.cpp
2014-02-06 13:16:11 +01:00
Marco Martin
308f59bc68 port to new api 2014-02-04 17:29:28 +01:00
l10n daemon script
063366d681 SVN_SILENT made messages (.desktop file) 2014-02-01 04:10:47 +00:00
Sebastian Kügler
53b4608327 Port examples to units.iconSizes 2014-01-22 00:41:02 +01:00
l10n daemon script
a12184e857 SVN_SILENT made messages (.desktop file) 2014-01-11 04:00:30 +00:00
l10n daemon script
beb8322c3d SVN_SILENT made messages (.desktop file) 2013-10-27 04:03:10 +00:00
l10n daemon script
45879b3d0b SVN_SILENT made messages (.desktop file) 2013-09-07 04:15:43 +00:00
l10n daemon script
42f4f3059e SVN_SILENT made messages (.desktop file) 2013-09-05 04:02:11 +00:00
Marco Martin
8f74e67f9d old test applets live now in examples 2013-09-04 11:57:46 +02:00