Commits · eacdb80698124ad8f0f5b32b7c3b20160594b740 · Utilities / KDebugSettings

19 Aug, 2015 1 commit
- Use new ECMQtDeclareLoggingCategory · eacdb806
  Laurent Montel authored Aug 19, 2015
  
  eacdb806
08 Aug, 2015 1 commit
- add the kf5 debug areas · a00e1d8f
  David Faure authored Aug 09, 2015
  
  a00e1d8f
31 Jul, 2015 2 commits
- SVN_SILENT made messages (.desktop file) - always resolve ours · b4fe63c8
  Script Kiddy authored Jul 31, 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"
```
  b4fe63c8
- Merge remote-tracking branch 'origin/Applications/15.08' · 884f1d3e
  Laurent Montel authored Jul 31, 2015
  
  884f1d3e
30 Jul, 2015 2 commits
- fix HiDPI for kdebugsettings · 759a4c87
  Christoph Cullmann authored Jul 30, 2015
  
  759a4c87
- fix HiDPI for kdebugsettings · 5462475b
  Christoph Cullmann authored Jul 30, 2015
  
  5462475b
29 Jul, 2015 4 commits
- Merge remote-tracking branch 'origin/Applications/15.08' · fe90de57
  Laurent Montel authored Jul 29, 2015
  
  fe90de57
- Make sure to create patch. · 18506b27
  Laurent Montel authored Jul 29, 2015
```
Bug reported by	Andreas Cord-Landwehr
```
  18506b27
- Merge remote-tracking branch 'origin/Applications/15.08' · d5545fc8
  Laurent Montel authored Jul 29, 2015
  
  d5545fc8
- Fix Bug 350743 - .desktop file missing categories · f18b5119
  Laurent Montel authored Jul 29, 2015
```
FIXED-IN: 15.08
BUG: 350743
```
  f18b5119
27 Jul, 2015 3 commits
- Merge remote-tracking branch 'origin/Applications/15.08' · edfef013
  Laurent Montel authored Jul 27, 2015
  
  edfef013
- Add Application/Versioning · 5686ed46
  Laurent Montel authored Jul 27, 2015
  
  5686ed46
- increase · 415c72da
  Laurent Montel authored Jul 27, 2015
  
  415c72da
24 Jun, 2015 1 commit

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

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

1ca4ca45

02 Jun, 2015 1 commit

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

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

1998c0c2

23 May, 2015 1 commit
- Astyle kdelibs · 92256e3f
  Laurent Montel authored May 23, 2015
  
  92256e3f
22 May, 2015 5 commits
- It was moved to kdepimlibs-categories file · 1181b261
  Laurent Montel authored May 22, 2015
  
  1181b261
- Add kdebugsettings categorie · 37bc1844
  Laurent Montel authored May 22, 2015
  
  37bc1844
- Insert categories · dfe351b9
  Laurent Montel authored May 22, 2015
  
  dfe351b9
- kdebugsettings must use debug logging too :) · e5880885
  Laurent Montel authored May 22, 2015
  
  e5880885
- Allow to insert categories · 8b5e7a74
  Laurent Montel authored May 22, 2015
  
  8b5e7a74
21 May, 2015 1 commit

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

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

d931f277

20 May, 2015 1 commit
- Fix save file when ini file doesn't exist · eb7dc0ea
  Laurent Montel authored May 20, 2015
  
  eb7dc0ea
18 May, 2015 2 commits
- Make it const · a72439e7
  Laurent Montel authored May 18, 2015
  
  a72439e7
- Start to implement load categories files · 58f2f12e
  Laurent Montel authored May 18, 2015
  
  58f2f12e
17 May, 2015 1 commit

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

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

deac8de7

30 Apr, 2015 1 commit
- Move kdepim categories in kdepim package directly · 35766eb2
  Laurent Montel authored Apr 30, 2015
```
=> each time that we add new categorie no necessary to release
a new kdebugsettings package
```
  35766eb2
29 Apr, 2015 1 commit
- Minor · ee11e49b
  Laurent Montel authored Apr 29, 2015
  
  ee11e49b
25 Apr, 2015 1 commit

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

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

406beea6

22 Apr, 2015 2 commits
- Version 1.0 now :) · 81d89b0e
  Laurent Montel authored Apr 22, 2015
  
  81d89b0e
- Fix includes · d72f98ef
  Laurent Montel authored Apr 22, 2015
  
  d72f98ef
18 Apr, 2015 1 commit

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

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

adf61fff

25 Mar, 2015 1 commit
- Minor optimization · 1253ff1b
  Laurent Montel authored Mar 25, 2015
  
  1253ff1b
24 Mar, 2015 1 commit
- Avoid duplicate entries · 1873edfa
  Laurent Montel authored Mar 24, 2015
  
  1873edfa
23 Mar, 2015 2 commits
- Add COPYING file · f44b6226
  Laurent Montel authored Mar 23, 2015
  
  f44b6226
- Not necessary · b5fecb31
  Laurent Montel authored Mar 23, 2015
  
  b5fecb31
22 Mar, 2015 2 commits

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

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

733bfda1

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

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

83e9703c

21 Mar, 2015 1 commit

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

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

a58e3691

18 Mar, 2015 1 commit
- fix caption · 14890c39
  Laurent Montel authored Mar 18, 2015
  
  14890c39