Commits · master · Plasma Mobile / Plasma Camera

18 Jan, 2021 1 commit

Volker Krause authored Jan 18, 2021

This needs to match the name used in the Appstream and/or desktop file for
the nightly build F-Droid repo to pick this up correctly.

f7fac213

10 Jan, 2021 1 commit

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

Script Kiddy authored Jan 10, 2021

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"

5069e08d

06 Jan, 2021 2 commits
- SVN_SILENT made messages (.desktop file) - always resolve ours · b6bc9c05
  Script Kiddy authored Jan 06, 2021
```
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"
```
  b6bc9c05
- GIT_SILENT made messages (after extraction) · 0ec043a9
  Script Kiddy authored Jan 06, 2021
  
  0ec043a9
02 Jan, 2021 2 commits
- SVN_SILENT made messages (.desktop file) - always resolve ours · 39bdda97
  Script Kiddy authored Jan 02, 2021
```
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"
```
  39bdda97
- GIT_SILENT made messages (after extraction) · b974114c
  Script Kiddy authored Jan 02, 2021
  
  b974114c
08 Dec, 2020 2 commits
- SVN_SILENT made messages (.desktop file) - always resolve ours · c23e7911
  Script Kiddy authored Dec 08, 2020
```
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"
```
  c23e7911
- GIT_SILENT made messages (after extraction) · a87c8750
  Script Kiddy authored Dec 08, 2020
  
  a87c8750
28 Nov, 2020 1 commit

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

Script Kiddy authored Nov 28, 2020

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"

cc64bd9a

08 Nov, 2020 1 commit
- Remove some useless comments · 10fa00eb
  Nicolas Fella authored Nov 09, 2020
```
They don't add any value
```
  10fa00eb
27 Oct, 2020 2 commits
- SVN_SILENT made messages (.desktop file) - always resolve ours · a6cc2b87
  Script Kiddy authored Oct 27, 2020
```
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"
```
  a6cc2b87
- GIT_SILENT made messages (after extraction) · 36b8f42b
  Script Kiddy authored Oct 27, 2020
  
  36b8f42b
09 Oct, 2020 1 commit

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

Script Kiddy authored Oct 09, 2020

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"

063614ed

05 Oct, 2020 2 commits
- SVN_SILENT made messages (.desktop file) - always resolve ours · b5d3a028
  Script Kiddy authored Oct 05, 2020
```
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"
```
  b5d3a028
- GIT_SILENT made messages (after extraction) · 6e3eccf6
  Script Kiddy authored Oct 05, 2020
  
  6e3eccf6
01 Oct, 2020 1 commit

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

Script Kiddy authored Oct 01, 2020

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"

a722c52c

21 Sep, 2020 1 commit

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

Script Kiddy authored Sep 21, 2020

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"

8c33145b

18 Sep, 2020 1 commit

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

Script Kiddy authored Sep 18, 2020

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"

ca65074e

14 Sep, 2020 1 commit

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

Script Kiddy authored Sep 14, 2020

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"

0ad71dff

06 Sep, 2020 1 commit

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

Script Kiddy authored Sep 06, 2020

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"

cbdf0775

05 Sep, 2020 1 commit

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

Script Kiddy authored Sep 05, 2020

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"

cf560664

01 Sep, 2020 1 commit

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

Script Kiddy authored Sep 01, 2020

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"

5f6f37b0

29 Aug, 2020 1 commit

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

Script Kiddy authored Aug 29, 2020

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"

70ad99e0

25 Aug, 2020 1 commit

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

Script Kiddy authored Aug 25, 2020

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"

d484fb41

18 Aug, 2020 1 commit

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

Script Kiddy authored Aug 18, 2020

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"

774d2dab

17 Aug, 2020 1 commit

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

Script Kiddy authored Aug 17, 2020

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"

58aa5277

16 Aug, 2020 1 commit

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

Script Kiddy authored Aug 16, 2020

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"

51ca4401

15 Aug, 2020 1 commit

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

Script Kiddy authored Aug 15, 2020

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"

3e75d691

14 Aug, 2020 1 commit

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

Script Kiddy authored Aug 14, 2020

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"

31a50f2a

13 Aug, 2020 1 commit

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

Script Kiddy authored Aug 13, 2020

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"

c7744ce7

12 Aug, 2020 2 commits
- Fix licensing · 5b1d5bc9
  Jonah Brüchert authored Aug 12, 2020
  
  5b1d5bc9
- SVN_SILENT made messages (.desktop file) - always resolve ours · 60017f7a
  Script Kiddy authored Aug 12, 2020
```
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"
```
  60017f7a
11 Aug, 2020 2 commits

Rename desktopentry · f37b6376

Nicolas Fella authored Aug 11, 2020

I don't like having mobile in there given that we usually aim for convergent applications. One can argue that a camera app is primarily useful on mobile, but in general I want to avoid having the word mobile in the naming scheme

f37b6376

Remove unused cmake variable · 5bcc65d1
Nicolas Fella authored Aug 11, 2020

5bcc65d1

09 Aug, 2020 4 commits
- cmake cleanup · eb702105
  Nicolas Fella authored Aug 09, 2020
  
  eb702105
- Port to KConfigXT and drop dependency on Qt.labs module · ce7c2b75
  Jonah Brüchert authored Aug 09, 2020
```
* Bump Qt requirement to 5.14 for qmlRegisterSingletonInstance
```
  ce7c2b75
- Only assign childrenList once · de827deb
  Jonah Brüchert authored Aug 09, 2020
  
  de827deb
- Replace context property use · 198d04ae
  Jonah Brüchert authored Aug 09, 2020
  
  198d04ae
31 Jul, 2020 1 commit
- GIT_SILENT made messages (after extraction) · d95ac061
  Script Kiddy authored Jul 31, 2020
  
  d95ac061
18 Jun, 2020 1 commit

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

Script Kiddy authored Jun 18, 2020

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"

af2638fb