Commit graph

15 commits

Author SHA1 Message Date
l10n daemon script 0daae53367 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-24 09:52:38 +00:00
l10n daemon script 4e96b1a42f 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-04 11:02:00 +00:00
l10n daemon script a7484d2ce5 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-15 09:54:53 +00:00
l10n daemon script 5d115201af SVN_SILENT made messages (.desktop file) 2015-03-12 10:17:33 +00:00
l10n daemon script 157df4b4a6 SVN_SILENT made messages (.desktop file) 2015-03-11 09:43:09 +00:00
l10n daemon script 5431aff4df SVN_SILENT made messages (.desktop file) 2015-03-10 13:14:42 +00:00
l10n daemon script 6b760e926d SVN_SILENT made messages (.desktop file) 2015-03-09 09:36:36 +00:00
l10n daemon script 42e52a1eea SVN_SILENT made messages (.desktop file) 2015-03-08 09:41:37 +00:00
l10n daemon script 06bd36e225 SVN_SILENT made messages (.desktop file) 2015-03-07 10:01:52 +00:00
l10n daemon script 51181dad2b SVN_SILENT made messages (.desktop file) 2015-03-06 04:32:04 +00:00
Lukáš Tinkl 037d5db85b Q_DECL_OVERRIDE 2014-11-03 23:52:18 +01:00
Frank Reininghaus 01e4f60a09 Merge remote-tracking branch 'origin/master' into frameworks
Conflicts:
	dolphin/src/main.cpp
	kdepasswd/kcm/kcm_useraccount.desktop
	plasma/applets/folderview/folderview.cpp
2014-10-16 20:36:49 +02:00
Hrvoje Senjan 64bc639395 Revert "Fix desktop file"
This reverts commit ecd2ca2222f88c9aea1c23a57658a8a4e9ff54f9.

Dolphin still uses KApp/KCmdLineArgs, so qwindowtitle is not recognized
2014-10-08 12:51:30 +02:00
Montel Laurent 6ff385e71a Fix desktop file 2014-10-08 08:12:46 +02:00
Montel Laurent a705337fab Convert to reverse dns 2014-10-07 07:32:35 +02:00
Renamed from src/dolphin.desktop (Browse further)