Commits · 0bb0a4c0a9c6391993a3f5eba4d34f8027f9b498 · Network / Kopete

21 May, 2022 1 commit
- Add ki18n_install and kdoctools_install · 0bb0a4c0
  Albert Astals Cid authored May 22, 2022
  
  0bb0a4c0
18 May, 2022 1 commit

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

Script Kiddy authored May 18, 2022

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"

592cad77

15 May, 2022 2 commits
- SVN_SILENT made messages (.desktop file) - always resolve ours · 6eddda54
  Script Kiddy authored May 15, 2022
```
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"
```
  6eddda54
- GIT_SILENT made messages (after extraction) · b0570fbf
  Script Kiddy authored May 15, 2022
  
  b0570fbf
10 May, 2022 1 commit

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

Script Kiddy authored May 10, 2022

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"

309a5871

02 May, 2022 5 commits
- Port deprecated qSort() -> std::sort(), qStableSort() -> std::stable_sort() · 39d0e2d8
  Jonathan Marten authored May 01, 2022
  
  39d0e2d8
- Port deprecated QSet::fromList() -> constructor, QSet::toList() -> values() · 438ec374
  Jonathan Marten authored May 01, 2022
  
  438ec374
- Use 'override' as identified by GCC · 94efb577
  Jonathan Marten authored May 01, 2022
  
  94efb577
- Port deprecated QFlags(0) -> default constructor · 71a61899
  Jonathan Marten authored Apr 30, 2022
  
  71a61899
- Port deprecated QString::null -> QString() · a1f83f0c
  Jonathan Marten authored Apr 30, 2022
  
  a1f83f0c
01 May, 2022 2 commits
- SVN_SILENT made messages (.desktop file) - always resolve ours · ed714881
  Script Kiddy authored May 01, 2022
```
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"
```
  ed714881
- GIT_SILENT made messages (after extraction) · 839138d1
  Script Kiddy authored May 01, 2022
  
  839138d1
29 Apr, 2022 1 commit

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

Script Kiddy authored Apr 29, 2022

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"

56c875a5

25 Apr, 2022 1 commit

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

Script Kiddy authored Apr 25, 2022

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"

62f65810

01 Apr, 2022 2 commits
- SVN_SILENT made messages (.desktop file) - always resolve ours · 914f0965
  Script Kiddy authored Apr 01, 2022
```
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"
```
  914f0965
- GIT_SILENT made messages (after extraction) · 6e4b0c2b
  Script Kiddy authored Apr 01, 2022
  
  6e4b0c2b
29 Mar, 2022 1 commit

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

Script Kiddy authored Mar 29, 2022

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"

c3e317cb

27 Mar, 2022 2 commits
- SVN_SILENT made messages (.desktop file) - always resolve ours · a31b1b21
  Script Kiddy authored Mar 27, 2022
```
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"
```
  a31b1b21
- GIT_SILENT made messages (after extraction) · 707a5f19
  Script Kiddy authored Mar 27, 2022
  
  707a5f19
20 Mar, 2022 1 commit
- GIT_SILENT made messages (after extraction) · 7c57456c
  Script Kiddy authored Mar 20, 2022
  
  7c57456c
09 Mar, 2022 2 commits
- Add content rating to appdata file · 31e60659
  Heiko Becker authored Mar 09, 2022 and Albert Astals Cid committed Mar 09, 2022
```
Should make the appstream test happy.
```
  31e60659
- build: Require cmake 3.16 and clean up a bit · 4fcacce4
  Heiko Becker authored Mar 09, 2022
```
Allows us to use FindALSA from cmake instead of kdelibs4support and
FindEXPAT from cmake instead of our own.
```
  4fcacce4
23 Dec, 2021 1 commit

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

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

69f6c311

29 Nov, 2021 2 commits
- Add CI · 0a9b454e
  Albert Astals Cid authored Nov 29, 2021
  
  0a9b454e
- SVN_SILENT made messages (.desktop file) - always resolve ours · 0fbaf7f1
  Script Kiddy authored Nov 29, 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"
```
  0fbaf7f1
28 Nov, 2021 1 commit

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

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

5d203b1a

10 Oct, 2021 1 commit
- GIT_SILENT made messages (after extraction) · b0c532ff
  Script Kiddy authored Oct 10, 2021
  
  b0c532ff
01 Oct, 2021 1 commit
- ChatMessagePart: return if view() is nullptr · d7c8d986
  Oleg Solovyov authored Oct 01, 2021
```
BUG: 436513
```
  d7c8d986
19 Sep, 2021 2 commits
- SVN_SILENT made messages (.desktop file) - always resolve ours · ec24d08f
  Script Kiddy authored Sep 19, 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"
```
  ec24d08f
- GIT_SILENT made messages (after extraction) · e0bee718
  Script Kiddy authored Sep 19, 2021
  
  e0bee718
22 Aug, 2021 1 commit

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

Script Kiddy authored Aug 22, 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"

a5ea75f5

02 Jun, 2021 1 commit

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

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

76a56b2b

21 May, 2021 1 commit
- GIT_SILENT made messages (after extraction) · f7ebe27d
  Script Kiddy authored May 21, 2021
  
  f7ebe27d
17 Mar, 2021 1 commit
- GIT_SILENT made messages (after extraction) · 1decd7b4
  Script Kiddy authored Mar 17, 2021
  
  1decd7b4
18 Feb, 2021 1 commit

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

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

402c1e2d

18 Dec, 2020 1 commit

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

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

92fb46f9

01 Dec, 2020 1 commit

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

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

5f4105da

28 Nov, 2020 1 commit
- Remove unused include · eb34263c
  Nicolas Fella authored Nov 28, 2020
  
  eb34263c
07 Nov, 2020 1 commit

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

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

365eea16

29 Oct, 2020 1 commit

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

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

5b1d3ef2