Commits · 366ea6691935b11c32986ff5552fec81f5bd1a8e · Plasma Mobile / Plasma Mobile Settings

26 Jul, 2018 1 commit

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

Script Kiddy authored Jul 26, 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"

366ea669

14 Jul, 2018 1 commit

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

Script Kiddy authored Jul 14, 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"

d0e9e944

21 May, 2018 1 commit

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

Script Kiddy authored May 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"

4249171c

19 May, 2018 1 commit

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

Script Kiddy authored May 19, 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"

99425df6

23 Apr, 2018 1 commit

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

Script Kiddy authored Apr 23, 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"

ef5ba3f7

08 Feb, 2018 1 commit

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

Script Kiddy authored Feb 08, 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"

ceb6408f

13 Jan, 2018 1 commit

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

Script Kiddy authored Jan 13, 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"

bd185d5e

27 Nov, 2017 1 commit

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

Script Kiddy authored Nov 27, 2017

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"

286ad64a

21 Nov, 2017 1 commit

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

Script Kiddy authored Nov 21, 2017

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"

4eda5e41

20 Nov, 2017 1 commit

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

Script Kiddy authored Nov 20, 2017

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"

de5bea31

19 Sep, 2017 1 commit

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

Script Kiddy authored Sep 19, 2017

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"

7d0f2139

18 Sep, 2017 1 commit

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

Script Kiddy authored Sep 18, 2017

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"

390db5a3

15 Sep, 2017 1 commit

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

Script Kiddy authored Sep 15, 2017

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"

97dbc278

05 Sep, 2017 1 commit

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

Script Kiddy authored Sep 05, 2017

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"

b2ab0163

03 Sep, 2017 1 commit

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

Script Kiddy authored Sep 03, 2017

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"

cf761f1c

01 Sep, 2017 1 commit

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

Script Kiddy authored Sep 01, 2017

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"

3a9dc9d2

27 Aug, 2017 1 commit

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

Script Kiddy authored Aug 27, 2017

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"

2890063c

23 Aug, 2017 1 commit

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

Script Kiddy authored Aug 23, 2017

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"

a0c8d752

21 Aug, 2017 1 commit

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

Script Kiddy authored Aug 21, 2017

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"

18db7930

19 Aug, 2017 1 commit

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

Script Kiddy authored Aug 19, 2017

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"

104bf4fe

18 Aug, 2017 1 commit

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

Script Kiddy authored Aug 18, 2017

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"

e088e323

16 Aug, 2017 1 commit

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

Script Kiddy authored Aug 16, 2017

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"

1c405224

12 Aug, 2015 1 commit
- Actually rename to plasma-settings in desktop files · ef097059
  Bhushan Shah authored Aug 12, 2015
  
  ef097059
19 Jun, 2015 1 commit

Basic Appearane settings module · af871d43

Sebastian Kügler authored Jun 18, 2015

Just allows to set the theme, currently operates globally, this will
need some diversification between apps and the shell, but it's a decent
start.

af871d43

11 Jun, 2015 1 commit
- Add formfactor key to time module · 7632a824
  Sebastian Kügler authored Jun 10, 2015
  
  7632a824
06 Jun, 2015 1 commit
- Use active-settings instead of kcmshell5 · 046aa600
  Sebastian Kügler authored Jun 05, 2015
```
This is stuff for mobile.
```
  046aa600
05 Jun, 2015 1 commit
- make-it-build · 766f71a0
  Sebastian Kügler authored Jun 04, 2015
```
- Adjust cmake files
- Add missing .desktop file
```
  766f71a0