Commits · master · Network / Ring KDE Client

27 Jun, 2020 2 commits
- SVN_SILENT made messages (.desktop file) - always resolve ours · f8c095e1
  Script Kiddy authored Jun 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"
```
  f8c095e1
- GIT_SILENT made messages (after extraction) · a6afdc93
  Script Kiddy authored Jun 27, 2020
  
  a6afdc93
24 Jun, 2020 2 commits
- SVN_SILENT made messages (.desktop file) - always resolve ours · b0a8875e
  Script Kiddy authored Jun 24, 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"
```
  b0a8875e
- GIT_SILENT made messages (after extraction) · af5db7db
  Script Kiddy authored Jun 24, 2020
  
  af5db7db
18 Jun, 2020 2 commits
- SVN_SILENT made messages (.desktop file) - always resolve ours · 122cf84b
  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"
```
  122cf84b
- GIT_SILENT made messages (after extraction) · 2aca473b
  Script Kiddy authored Jun 18, 2020
  
  2aca473b
17 Jun, 2020 2 commits
- SVN_SILENT made messages (.desktop file) - always resolve ours · cff11ac8
  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"
```
  cff11ac8
- GIT_SILENT made messages (after extraction) · c39fda11
  Script Kiddy authored Jun 17, 2020
  
  c39fda11
21 May, 2020 1 commit
- GIT_SILENT: add Ring-KDE icon as repository logo · 67963015
  Yuri Chornoivan authored May 21, 2020
  
  67963015
12 Feb, 2020 2 commits
- SVN_SILENT made messages (.desktop file) - always resolve ours · 73c7aeae
  Script Kiddy authored Feb 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"
```
  73c7aeae
- GIT_SILENT made messages (after extraction) · e0fef796
  Script Kiddy authored Feb 12, 2020
  
  e0fef796
06 Jan, 2020 1 commit

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

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

720c82bb

10 Dec, 2019 1 commit
- GIT_SILENT made messages (after extraction) · 580f3af2
  Script Kiddy authored Dec 10, 2019
  
  580f3af2
08 Dec, 2019 2 commits
- SVN_SILENT made messages (.desktop file) - always resolve ours · b8b37e7f
  Script Kiddy authored Dec 08, 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"
```
  b8b37e7f
- GIT_SILENT made messages (after extraction) · c1a51806
  Script Kiddy authored Dec 08, 2019
  
  c1a51806
04 Nov, 2019 1 commit

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

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

76f2bb12

27 Oct, 2019 1 commit

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

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

4eb093a2

20 Oct, 2019 1 commit
- GIT_SILENT made messages (after extraction) · 36ab7625
  Script Kiddy authored Oct 20, 2019
  
  36ab7625
12 Oct, 2019 1 commit
- Fix minor typos · feafb6ec
  Yuri Chornoivan authored Oct 12, 2019
  
  feafb6ec
01 Oct, 2019 1 commit
- More i18n() · 26cdc366
  Yuri Chornoivan authored Oct 01, 2019
  
  26cdc366
29 Sep, 2019 1 commit
- Use i18n() · a5689a82
  Yuri Chornoivan authored Sep 29, 2019
  
  a5689a82
07 Sep, 2019 2 commits
- SVN_SILENT made messages (.desktop file) - always resolve ours · ad27aaef
  Script Kiddy authored Sep 07, 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"
```
  ad27aaef
- GIT_SILENT made messages (after extraction) · 8f834b6a
  Script Kiddy authored Sep 07, 2019
  
  8f834b6a
05 Aug, 2019 2 commits
- SVN_SILENT made messages (.desktop file) - always resolve ours · 4adbbb49
  Script Kiddy authored Aug 05, 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"
```
  4adbbb49
- GIT_SILENT made messages (after extraction) · c73ba78e
  Script Kiddy authored Aug 05, 2019
  
  c73ba78e
21 Jul, 2019 1 commit

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

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

a70c3a5e

15 Jul, 2019 2 commits
- SVN_SILENT made messages (.desktop file) - always resolve ours · b3365b2f
  Script Kiddy authored Jul 15, 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"
```
  b3365b2f
- GIT_SILENT made messages (after extraction) · 6d61061f
  Script Kiddy authored Jul 15, 2019
  
  6d61061f
14 Jul, 2019 1 commit

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

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

0dfd5798

25 Jun, 2019 2 commits
- SVN_SILENT made messages (.desktop file) - always resolve ours · ac9c703c
  Script Kiddy authored Jun 25, 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"
```
  ac9c703c
- GIT_SILENT made messages (after extraction) · b059e73b
  Script Kiddy authored Jun 25, 2019
  
  b059e73b
12 Jun, 2019 3 commits
- doc: Write docbook date in standard format · 2b78e2fb
  Alexander Potashev authored Jun 13, 2019
  
  2b78e2fb
- SVN_SILENT made messages (.desktop file) - always resolve ours · ae09e95f
  Script Kiddy authored Jun 12, 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"
```
  ae09e95f
- GIT_SILENT made messages (after extraction) · 580f7d4f
  Script Kiddy authored Jun 12, 2019
  
  580f7d4f
06 Jun, 2019 2 commits
- SVN_SILENT made messages (.desktop file) - always resolve ours · 6a091e05
  Script Kiddy authored Jun 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"
```
  6a091e05
- GIT_SILENT made messages (after extraction) · 30495ca1
  Script Kiddy authored Jun 06, 2019
  
  30495ca1
04 Jun, 2019 1 commit

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

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

6004b087

03 Jun, 2019 1 commit

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

Script Kiddy authored Jun 03, 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"

8c8fc6b5

02 Jun, 2019 1 commit

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

Script Kiddy authored Jun 02, 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"

8fa30cbe

31 May, 2019 1 commit
- tidy up name and generic name · 9c6288f5
  Jonathan Esk-Riddell authored May 31, 2019
  
  9c6288f5