Commits · aa3c0ed30e4b502f0f71c57592ee9f6236c4e1ba · Utilities / KTeaTime

09 Apr, 2020 1 commit

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

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"

aa3c0ed3

22 Mar, 2020 1 commit

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

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

3194875b

11 Nov, 2019 1 commit

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

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

da030b61

24 Oct, 2019 1 commit

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

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

ca191b08

07 Sep, 2019 1 commit

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

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"

891cad09

17 Aug, 2019 1 commit

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

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

69f69d42

04 Aug, 2019 1 commit

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

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

d469b757

31 Jul, 2019 1 commit

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

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

6937ef52

29 Jul, 2019 1 commit

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

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

dc425751

27 Jul, 2019 1 commit

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

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

7aeda5b9

26 Jul, 2019 1 commit

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

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

9fb7c0cb

25 Jul, 2019 1 commit

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

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

8fd477f8

24 Jul, 2019 1 commit

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

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

82ce45ca

23 Jul, 2019 1 commit

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

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

b8ebfb9c

21 Jul, 2019 1 commit

Port from KPassivePopup to KNotification · 8f96293a

Nicolas Fella authored Jul 18, 2019

Summary: KPassivePopup is hideous and shouldn't be used any more. Replace it with a persistent KNotification

Test Plan: Click on tray icon: Notification appears. Start a tea: Notification changes content. Click tray again, notification disappears

Reviewers: sboehmann, dakon, broulik, fb, dfaure, davidedmundson

Reviewed By: davidedmundson

Subscribers: kde-utils-devel

Differential Revision: https://phabricator.kde.org/D22542

8f96293a

15 Apr, 2019 1 commit

Add DesktopEntry to notifyrc · da98e9a9

Kai Uwe Broulik authored Apr 15, 2019

This allows the notification KCM to identify KTeaTime as an application.

Differential Revision: https://phabricator.kde.org/D20487

da98e9a9

06 Jan, 2019 1 commit

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

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

4c823a39

09 Aug, 2018 1 commit

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

Script Kiddy authored Aug 09, 2018

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"

4c288a7b

25 Jul, 2018 1 commit

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

Script Kiddy authored Jul 25, 2018

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"

7e21998d

18 Apr, 2017 1 commit

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

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

a9b1e7d7

20 Dec, 2016 1 commit

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

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"

ee7e368e

05 Jan, 2016 1 commit
- Use sounds from Oxygen theme instead of from kdelibs4 kde-runtime · 305b9e74
  Jonathan Riddell authored Jan 05, 2016
  
  305b9e74
28 Aug, 2015 1 commit

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

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

c8abd24d

27 Aug, 2015 1 commit

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

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

cc29f4e4

04 Aug, 2015 1 commit

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

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

2323a5d1

09 Jun, 2015 1 commit

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

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

f63d4a80

29 Apr, 2015 1 commit

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

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

e4860c64

06 Apr, 2015 1 commit

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

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"

6eb59cde

28 Feb, 2015 1 commit
- SVN_SILENT made messages (.desktop file) · 5fc26a0b
  Script Kiddy authored Feb 28, 2015
  
  5fc26a0b
27 Feb, 2015 1 commit
- SVN_SILENT made messages (.desktop file) · d1bddcc9
  Script Kiddy authored Feb 27, 2015
  
  d1bddcc9
25 Jul, 2014 1 commit
- SVN_SILENT made messages (.desktop file) · 5884156e
  Script Kiddy authored Jul 25, 2014
  
  5884156e
24 Jul, 2014 1 commit
- SVN_SILENT made messages (.desktop file) · 0cc3a778
  Script Kiddy authored Jul 24, 2014
  
  0cc3a778
02 Apr, 2014 1 commit
- SVN_SILENT made messages (.desktop file) · 42c0dabf
  Script Kiddy authored Apr 02, 2014
  
  42c0dabf
13 Mar, 2013 1 commit
- SVN_SILENT made messages (.desktop file) · 15e1cc8d
  Script Kiddy authored Mar 13, 2013
  
  15e1cc8d
24 Dec, 2012 1 commit
- SVN_SILENT made messages (.desktop file) · 6dbe8e89
  Script Kiddy authored Dec 24, 2012
```
svn path=/branches/KDE/4.10/kdetoys/kteatime/; revision=1329685
```
  6dbe8e89
23 Dec, 2012 1 commit
- SVN_SILENT made messages (.desktop file) · bb68426b
  Script Kiddy authored Dec 23, 2012
```
svn path=/branches/KDE/4.10/kdetoys/kteatime/; revision=1329617
```
  bb68426b
02 Apr, 2012 1 commit
- SVN_SILENT made messages (.desktop file) · 695cff26
  Script Kiddy authored Apr 02, 2012
```
svn path=/trunk/KDE/kdetoys/kteatime/; revision=1287985
```
  695cff26
16 Feb, 2012 1 commit
- SVN_SILENT made messages (.desktop file) · 91ea7824
  Script Kiddy authored Feb 16, 2012
```
svn path=/trunk/KDE/kdetoys/kteatime/; revision=1280279
```
  91ea7824
29 Jan, 2012 1 commit
- SVN_SILENT made messages (.desktop file) · 77ea8b88
  Script Kiddy authored Jan 29, 2012
```
svn path=/trunk/KDE/kdetoys/kteatime/; revision=1276452
```
  77ea8b88
24 Jul, 2011 1 commit
- SVN_SILENT made messages (.desktop file) · 9e900591
  Script Kiddy authored Jul 24, 2011
```
svn path=/trunk/KDE/kdetoys/kteatime/; revision=1242913
```
  9e900591