Commits · 454ce40d4540b19b3d59434411cd92298d636daf · Network / Konversation

01 Jan, 2022 1 commit

Set StartupWMClass in desktop file · 454ce40d

Friedrich W. H. Kossebau authored Jan 01, 2022

Used by non-Plasma unixoid X-based shells to map windows to desktop files
e.g. in launcher UIs, which do not know about _KDE_NET_WM_DESKTOP_FILE and
instead expect (one of) the WM_CLASS entries to match the basename of the
desktop file by default. StartupWMClass overwrites that default.

454ce40d

01 Dec, 2021 1 commit

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

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

1ec17679

27 Mar, 2021 2 commits

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

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

1d1b5d3f

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

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

9288fab5

01 Dec, 2020 1 commit
- Remove X-KDE-ServiceTypes=DBUS/InstantMessenger (left-over from KIMProxy) · a10783ce
  Friedrich W. H. Kossebau authored Dec 01, 2020
  
  a10783ce
20 Oct, 2020 1 commit

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

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

fb996146

22 Sep, 2020 1 commit

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

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

8e2c1c0c

18 Jun, 2020 2 commits

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

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"

44fb113e

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

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"

e965e446

17 Jun, 2020 2 commits

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

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"

b2cfd602

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

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"

0225d35b

06 Jan, 2020 2 commits

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

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"

f4ebfd88

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

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"

b58ed5a5

19 Aug, 2017 1 commit

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

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

cd03aebf

19 Jul, 2017 1 commit

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

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

52d299e3

31 Mar, 2017 1 commit

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

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

21d80219

29 Mar, 2017 1 commit

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

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

99136327

20 Dec, 2016 1 commit

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

Script Kiddy authored Dec 20, 2016

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"

e159d5c4

02 Nov, 2016 2 commits

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

Script Kiddy authored Nov 02, 2016

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"

fa259b5f

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

Script Kiddy authored Nov 02, 2016

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"

81a8a31d

07 Sep, 2016 1 commit

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

Script Kiddy authored Sep 07, 2016

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"

855b8804

04 Nov, 2015 2 commits
- SVN_SILENT made messages (.desktop file) · c843a5d8
  Script Kiddy authored Nov 04, 2015
  
  c843a5d8
- SVN_SILENT made messages (.desktop file) - always resolve ours · 5e382444
  Script Kiddy authored Nov 04, 2015
```
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"
```
  5e382444
18 May, 2015 1 commit

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

Script Kiddy authored May 18, 2015

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"

ae4e3256

06 Apr, 2015 1 commit

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

Script Kiddy authored Apr 06, 2015

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"

cc49d400

10 Jan, 2015 1 commit
- SVN_SILENT made messages (.desktop file) · 4b1b3c35
  Script Kiddy authored Jan 10, 2015
  
  4b1b3c35
01 Nov, 2014 1 commit
- -caption no longer exists, use -qwindowtitle · 99eb68a3
  Luca Beltrame authored Nov 01, 2014
```
Since Konversation is now QAppilcation-based, so use -qwindowtitle instead of -caption
```
  99eb68a3
12 Oct, 2014 1 commit
- SVN_SILENT made messages (.desktop file) · f4731ec6
  Script Kiddy authored Oct 12, 2014
  
  f4731ec6
02 Oct, 2014 1 commit
- Convert to reverse dns · 8907393d
  Laurent Montel authored Oct 02, 2014
  
  8907393d
25 Jul, 2014 1 commit
- SVN_SILENT made messages (.desktop file) · 89dec0c1
  Script Kiddy authored Jul 25, 2014
  
  89dec0c1
24 Jul, 2014 1 commit
- SVN_SILENT made messages (.desktop file) · 95a8bb2c
  Script Kiddy authored Jul 24, 2014
  
  95a8bb2c
22 Apr, 2014 2 commits
- SVN_SILENT made messages (.desktop file) · 7a05e8dd
  Script Kiddy authored Apr 22, 2014
  
  7a05e8dd
- SVN_SILENT made messages (.desktop file) · 5ece9e19
  Script Kiddy authored Apr 22, 2014
  
  5ece9e19
09 Mar, 2014 2 commits
- SVN_SILENT made messages (.desktop file) · 719e5807
  Script Kiddy authored Mar 09, 2014
  
  719e5807
- SVN_SILENT made messages (.desktop file) · 4e49580b
  Script Kiddy authored Mar 09, 2014
  
  4e49580b
27 Jun, 2013 1 commit
- Enable startup notification support. · 0888c38d
  Eike Hein authored Jun 27, 2013
```
BUG:320797
```
  0888c38d
03 May, 2013 1 commit
- Remove erroneous double-quotes around %c in Exec line · 6d7859d1
  Pino Toscano authored May 03, 2013
  
  6d7859d1
18 Apr, 2013 1 commit
- Let kdelibs know we support URLs. · 8d69441e
  Eike Hein authored Apr 18, 2013
```
CCBUG:318509
```
  8d69441e
06 Feb, 2013 1 commit
- SVN_SILENT made messages (.desktop file) · 6c1f422a
  Script Kiddy authored Feb 06, 2013
  
  6c1f422a
05 Feb, 2013 1 commit
- SVN_SILENT made messages (.desktop file) · 9518fcf6
  Script Kiddy authored Feb 05, 2013
  
  9518fcf6