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

08 May, 2018 1 commit

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

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

d9a8fee4

05 May, 2018 1 commit
- CMake: remove KDELibs4Support dependency · 53e7c064
  Jonah Brüchert authored May 05, 2018
```
Reviewed-by: Bhushan Shah <bhush94@gmail.com>
```
  53e7c064
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

10 Apr, 2018 1 commit
- heuristic to decide whether to use our own padding or not · 89f1b089
  Marco Martin authored Apr 10, 2018
  
  89f1b089
13 Mar, 2018 1 commit

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

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

6d9b6bca

21 Feb, 2018 2 commits
- lgpl 2.1 better · f8e452ed
  Jonathan Riddell authored Feb 21, 2018
  
  f8e452ed
- add copying licence · 697371d1
  Jonathan Riddell authored Feb 21, 2018
  
  697371d1
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

06 Jan, 2018 1 commit

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

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

83e7daf8

24 Dec, 2017 1 commit

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

Script Kiddy authored Dec 24, 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"

4630fa73

20 Dec, 2017 1 commit

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

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

6e5fd15b

15 Dec, 2017 3 commits
- require the org.kde.kcm module · 3f52b49f
  Marco Martin authored Dec 15, 2017
  
  3f52b49f
- proper dbus name · 7cc04ebd
  Marco Martin authored Dec 15, 2017
  
  7cc04ebd
- Fix aboutdata so plasmashell is not blocked on it · a25ac6e2
  Bhushan Shah authored Dec 15, 2017
  
  a25ac6e2
11 Dec, 2017 1 commit

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

Script Kiddy authored Dec 11, 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"

42cf1ccb

08 Dec, 2017 1 commit

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

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

4e03cbf3

05 Dec, 2017 1 commit

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

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

5c728de1

04 Dec, 2017 1 commit

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

Script Kiddy authored Dec 04, 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"

873bffd8

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

31 Oct, 2017 1 commit
- bind a global settingsApp object · 3ad88ec1
  Marco Martin authored Oct 31, 2017
```
use it to manage the dbus unique connection
```
  3ad88ec1
30 Oct, 2017 1 commit
- Merge branch 'mart/kirigami' · 79d8f48a
  Marco Martin authored Oct 30, 2017
  
  79d8f48a
27 Oct, 2017 1 commit
- Make brightness change not open OSD · 1c1db769
  Bhushan Shah authored Oct 27, 2017
  
  1c1db769
23 Oct, 2017 6 commits
- remove dead files · 4ecfc3c5
  Marco Martin authored Oct 23, 2017
  
  4ecfc3c5
- remove dead files · 2c1c8dd1
  Marco Martin authored Oct 23, 2017
  
  2c1c8dd1
- don't link the import to plasma · e3c9fa16
  Marco Martin authored Oct 23, 2017
  
  e3c9fa16
- basic module loading working · f30d9958
  Marco Martin authored Oct 23, 2017
  
  f30d9958
- start the port to kirigami · 7e0717ad
  Marco Martin authored Oct 23, 2017
  
  7e0717ad
- rename ActiveSettings.qml -> main.qml · f46c9cb8
  Marco Martin authored Oct 23, 2017
  
  f46c9cb8
01 Oct, 2017 1 commit

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

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

13c3d4cb

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

11 Sep, 2017 1 commit

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

Script Kiddy authored Sep 11, 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"

b0e21154