Commits · master · Graphics / Kipi Plugins

19 Oct, 2020 1 commit
- GIT_SILENT made messages (after extraction) · 6f2c7308
  Script Kiddy authored Oct 19, 2020
  
  6f2c7308
05 Oct, 2020 1 commit

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

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"

dd67a577

17 Sep, 2020 1 commit
- GIT_SILENT made messages (after extraction) · 77ad0a7d
  Script Kiddy authored Sep 17, 2020
  
  77ad0a7d
03 Aug, 2020 2 commits
- Merge remote-tracking branch 'origin/release/20.08' · 98c70c5c
  Pino Toscano authored Aug 03, 2020
  
  98c70c5c
- appdata: fix formatting · 72663b93
  Pino Toscano authored Aug 03, 2020
```
remove stray unicode character that prevents the proper indentation
```
  72663b93
23 Jul, 2020 2 commits
- GIT_SILENT made messages (after extraction) · f7534ef2
  Script Kiddy authored Jul 23, 2020
  
  f7534ef2
- GIT_SILENT made messages (after extraction) · 1fe4473b
  Script Kiddy authored Jul 23, 2020
  
  1fe4473b
22 Jul, 2020 4 commits
- SVN_SILENT made messages (.desktop file) - always resolve ours · d212311a
  Script Kiddy authored Jul 22, 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"
```
  d212311a
- GIT_SILENT made messages (after extraction) · dc6865b5
  Script Kiddy authored Jul 22, 2020
  
  dc6865b5
- SVN_SILENT made messages (.desktop file) - always resolve ours · 38afb9d5
  Script Kiddy authored Jul 22, 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"
```
  38afb9d5
- GIT_SILENT made messages (after extraction) · 0fc8c90c
  Script Kiddy authored Jul 22, 2020
  
  0fc8c90c
07 Jul, 2020 1 commit
- GIT_SILENT made messages (after extraction) · 518ad3d7
  Script Kiddy authored Jul 07, 2020
  
  518ad3d7
18 Jun, 2020 2 commits
- SVN_SILENT made messages (.desktop file) - always resolve ours · 2590329a
  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"
```
  2590329a
- GIT_SILENT made messages (after extraction) · d28dd68e
  Script Kiddy authored Jun 18, 2020
  
  d28dd68e
17 Jun, 2020 2 commits
- SVN_SILENT made messages (.desktop file) - always resolve ours · f6a64867
  Script Kiddy authored Jun 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"
```
  f6a64867
- GIT_SILENT made messages (after extraction) · 3c248058
  Script Kiddy authored Jun 17, 2020
  
  3c248058
09 Jun, 2020 1 commit
- GIT_SILENT made messages (after extraction) · 4876327a
  Script Kiddy authored Jun 09, 2020
  
  4876327a
30 May, 2020 1 commit
- Populate the mailclient drop down also on FreeBSD. · 66c17816
  Tobias C. Berner authored May 30, 2020
```
Reviewers: #freebsd, cgilles

Differential Revision: https://phabricator.kde.org/D7133
```
  66c17816
11 May, 2020 2 commits
- SVN_SILENT made messages (.desktop file) - always resolve ours · f129c3fd
  Script Kiddy authored May 11, 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"
```
  f129c3fd
- GIT_SILENT made messages (after extraction) · d85bd469
  Script Kiddy authored May 11, 2020
  
  d85bd469
05 May, 2020 1 commit
- GIT_SILENT made messages (after extraction) · 99456f41
  Script Kiddy authored May 05, 2020
  
  99456f41
02 May, 2020 1 commit
- GIT_SILENT made messages (after extraction) · 92119322
  Script Kiddy authored May 02, 2020
  
  92119322
09 Apr, 2020 1 commit

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

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

f394ca14

20 Mar, 2020 1 commit
- GIT_SILENT made messages (after extraction) · 9c395800
  Script Kiddy authored Mar 20, 2020
  
  9c395800
04 Feb, 2020 1 commit
- GIT_SILENT made messages (after extraction) · 523b8a38
  Script Kiddy authored Feb 04, 2020
  
  523b8a38
31 Jan, 2020 1 commit
- GIT_SILENT made messages (after extraction) · 01dd0cbf
  Script Kiddy authored Jan 31, 2020
  
  01dd0cbf
28 Jan, 2020 1 commit
- GIT_SILENT made messages (after extraction) · 22a08c46
  Script Kiddy authored Jan 28, 2020
  
  22a08c46
17 Jan, 2020 1 commit
- Port to QRandomGenerator · 8dfc65bc
  Laurent Montel authored Jan 17, 2020
  
  8dfc65bc
09 Jan, 2020 1 commit
- GIT_SILENT made messages (after extraction) · 04a15514
  Script Kiddy authored Jan 09, 2020
  
  04a15514
30 Dec, 2019 1 commit
- GIT_SILENT made messages (after extraction) · c867cd04
  Script Kiddy authored Dec 30, 2019
  
  c867cd04
19 Dec, 2019 1 commit
- GIT_SILENT made messages (after extraction) · 32e6b5bb
  Script Kiddy authored Dec 19, 2019
  
  32e6b5bb
15 Dec, 2019 1 commit
- GIT_SILENT made messages (after extraction) · 338517d2
  Script Kiddy authored Dec 15, 2019
  
  338517d2
14 Dec, 2019 1 commit
- icon is just called kipi · ad10a82c
  Jonathan Riddell authored Dec 14, 2019
  
  ad10a82c
12 Dec, 2019 1 commit
- add a category · 68376d0a
  Jonathan Riddell authored Dec 12, 2019
  
  68376d0a
10 Dec, 2019 1 commit
- GIT_SILENT made messages (after extraction) · 652746f3
  Script Kiddy authored Dec 10, 2019
  
  652746f3
09 Dec, 2019 1 commit
- also extends kphotoalbum · 08d1b20c
  Jonathan Riddell authored Dec 09, 2019
  
  08d1b20c
07 Dec, 2019 1 commit
- GIT_SILENT made messages (after extraction) · 3cc190ea
  Script Kiddy authored Dec 07, 2019
  
  3cc190ea
06 Dec, 2019 1 commit
- GIT_SILENT made messages (after extraction) · b6c5cd07
  Script Kiddy authored Dec 06, 2019
  
  b6c5cd07
05 Dec, 2019 1 commit
- GIT_SILENT made messages (after extraction) · a513ebf2
  Script Kiddy authored Dec 05, 2019
  
  a513ebf2
03 Dec, 2019 1 commit
- typo · 335269ae
  Jonathan Riddell authored Dec 03, 2019
  
  335269ae