Commits · e7ec5388cc08e4e614f1596afd31a5bf562a6df0 · Plasma / Plasma Desktop

14 Jan, 2019 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · e7ec5388

Script Kiddy authored Jan 14, 2019

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"

e7ec5388

06 Jan, 2019 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · e27d6880

Script Kiddy authored Jan 06, 2019

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"

e27d6880

31 Dec, 2018 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · bbf4ee26

Script Kiddy authored Dec 31, 2018

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"

bbf4ee26

28 Dec, 2018 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · 2aa494d6

Script Kiddy authored Dec 28, 2018

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"

2aa494d6

21 Dec, 2018 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · 218f6b00

Script Kiddy authored Dec 21, 2018

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"

218f6b00

12 Dec, 2018 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · 226cbd27

Script Kiddy authored Dec 12, 2018

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"

226cbd27

11 Dec, 2018 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · 4057abea

Script Kiddy authored Dec 11, 2018

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"

4057abea

10 Dec, 2018 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · 6385b043

Script Kiddy authored Dec 10, 2018

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"

6385b043

07 Dec, 2018 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · 9ac9e0a1

Script Kiddy authored Dec 07, 2018

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"

9ac9e0a1

06 Dec, 2018 1 commit

SVN_SILENT made messages (.desktop file) - always resolve ours · 2d0a13c9

Script Kiddy authored Dec 06, 2018

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"

2d0a13c9

04 Dec, 2018 1 commit

Translate color scheme names · 40879615

Kai Uwe Broulik authored Dec 04, 2018

BUG: 401136
FIXED-IN: 5.15.0

Differential Revision: https://phabricator.kde.org/D17347

40879615

16 Feb, 2016 1 commit
- some complementary colors · 0d48ec23
  Marco Martin authored Feb 16, 2016
  
  0d48ec23
31 Mar, 2014 1 commit

Initial import from the monolithic kde-workspace. · 88ae0b60

Aleix Pol Gonzalez authored Mar 31, 2014

This is the beginning of revision history for this module. If you
want to look at revision history older than this, please refer to the
techbase wiki for how to use Git history grafting. At the time of
writing, this wiki is located here:

http://community.kde.org/Frameworks/GitOldHistory

If you have already performed the grafting and you don't see any
history beyond this commit, try running "git log" with the "--follow"
argument.

Branched from the monolithic repo kde-workspace, frameworks  branch, at commit
049113e719dd2fc4446d054fa1a3aada330094f0

88ae0b60