| Age | Commit message (Collapse) | Author | |
|---|---|---|---|
| 2015-06-16 | SVN_SILENT made messages (.desktop file) - always resolve ours | l10n daemon script | |
| 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-04 | SVN_SILENT made messages (.desktop file) - always resolve ours | l10n daemon script | |
| 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-13 | SVN_SILENT made messages (.desktop file) - always resolve ours | l10n daemon script | |
| 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-05 | SVN_SILENT made messages (.desktop file) - always resolve ours | l10n daemon script | |
| 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-04 | SVN_SILENT made messages (.desktop file) - always resolve ours | l10n daemon script | |
| 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 | SVN_SILENT made messages (.desktop file) - always resolve ours | l10n daemon script | |
| 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 | SVN_SILENT made messages (.desktop file) - always resolve ours | l10n daemon script | |
| 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 | SVN_SILENT made messages (.desktop file) - always resolve ours | l10n daemon script | |
| 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 | SVN_SILENT made messages (.desktop file) - always resolve ours | l10n daemon script | |
| 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-12 | SVN_SILENT made messages (.desktop file) | l10n daemon script | |
| 2015-03-11 | SVN_SILENT made messages (.desktop file) | l10n daemon script | |
| 2015-03-10 | SVN_SILENT made messages (.desktop file) | l10n daemon script | |
| 2015-03-09 | SVN_SILENT made messages (.desktop file) | l10n daemon script | |
| 2015-03-08 | SVN_SILENT made messages (.desktop file) | l10n daemon script | |
| 2015-03-07 | SVN_SILENT made messages (.desktop file) | l10n daemon script | |
| 2015-03-06 | SVN_SILENT made messages (.desktop file) | l10n daemon script | |
| 2014-11-03 | Q_DECL_OVERRIDE | Lukáš Tinkl | |
| 2014-10-16 | Merge remote-tracking branch 'origin/master' into frameworks | Frank Reininghaus | |
| Conflicts: dolphin/src/main.cpp kdepasswd/kcm/kcm_useraccount.desktop plasma/applets/folderview/folderview.cpp | |||
| 2014-10-08 | Revert "Fix desktop file" | Hrvoje Senjan | |
| This reverts commit ecd2ca2222f88c9aea1c23a57658a8a4e9ff54f9. Dolphin still uses KApp/KCmdLineArgs, so qwindowtitle is not recognized | |||
| 2014-10-08 | Fix desktop file | Montel Laurent | |
| 2014-10-07 | Convert to reverse dns | Montel Laurent | |
 |
index : dolphin | |
| Patched KDE Dolphin with Pixel Scaling | Conway |
| summaryrefslogtreecommitdiff |