Commits · 954581e533a329474da79999dd35dc3b7c25d7ef · System / KHelpCenter

24 Oct, 2020 1 commit

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

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

954581e5

18 Jun, 2020 1 commit

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

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"

26f94bc9

17 Jun, 2020 1 commit

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

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"

880f0bb8

05 Jun, 2018 1 commit

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

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

eefc68cf

08 Apr, 2016 1 commit
- SVN_SILENT made messages (.desktop file) · 5b447dff
  Script Kiddy authored Apr 08, 2016
  
  5b447dff
25 Mar, 2016 1 commit
- SVN_SILENT made messages (.desktop file) · 70ba679a
  Script Kiddy authored Mar 25, 2016
  
  70ba679a
07 Apr, 2015 1 commit

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

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

dd154dbf

03 May, 2014 1 commit
- SVN_SILENT made messages (.desktop file) · 7d760a9e
  Script Kiddy authored May 03, 2014
  
  7d760a9e
02 May, 2014 1 commit
- SVN_SILENT made messages (.desktop file) · 7e0a12e9
  Script Kiddy authored May 02, 2014
  
  7e0a12e9
29 Apr, 2014 2 commits
- SVN_SILENT made messages (.desktop file) · 1c44851d
  Script Kiddy authored Apr 29, 2014
  
  1c44851d
- SVN_SILENT made messages (.desktop file) · c27340ed
  Script Kiddy authored Apr 29, 2014
  
  c27340ed
28 Apr, 2014 4 commits
- SVN_SILENT made messages (.desktop file) · a1ee2457
  Script Kiddy authored Apr 28, 2014
  
  a1ee2457
- SVN_SILENT made messages (.desktop file) · 9f326591
  Script Kiddy authored Apr 28, 2014
  
  9f326591
- SVN_SILENT made messages (.desktop file) · 62445a2a
  Script Kiddy authored Apr 28, 2014
  
  62445a2a
- SVN_SILENT made messages (.desktop file) · 4614ac0f
  Script Kiddy authored Apr 28, 2014
  
  4614ac0f
27 Apr, 2014 1 commit
- SVN_SILENT made messages (.desktop file) · dc05c00f
  Script Kiddy authored Apr 27, 2014
  
  dc05c00f
12 Apr, 2014 1 commit
- SVN_SILENT made messages (.desktop file) · 88c3f3d9
  Script Kiddy authored Apr 12, 2014
  
  88c3f3d9
11 Apr, 2014 1 commit
- SVN_SILENT made messages (.desktop file) · 7e6080e9
  Script Kiddy authored Apr 11, 2014
  
  7e6080e9
15 Jan, 2014 1 commit
- SVN_SILENT made messages (.desktop file) · d7487562
  Script Kiddy authored Jan 15, 2014
  
  d7487562
08 Jul, 2013 1 commit
- SVN_SILENT made messages (.desktop file) · 2bb6bb25
  Script Kiddy authored Jul 08, 2013
  
  2bb6bb25
30 May, 2013 1 commit
- SVN_SILENT made messages (.desktop file) · 646a6ba5
  Script Kiddy authored May 30, 2013
  
  646a6ba5
18 Apr, 2013 1 commit
- SVN_SILENT made messages (.desktop file) · 6637dac0
  Script Kiddy authored Apr 18, 2013
  
  6637dac0
17 Apr, 2013 1 commit
- SVN_SILENT made messages (.desktop file) · b3a8a842
  Script Kiddy authored Apr 17, 2013
  
  b3a8a842
24 Dec, 2012 1 commit
- SVN_SILENT made messages (.desktop file) · ae7d98fb
  Script Kiddy authored Dec 24, 2012
  
  ae7d98fb
23 Dec, 2012 1 commit
- SVN_SILENT made messages (.desktop file) · daf2b174
  Script Kiddy authored Dec 23, 2012
  
  daf2b174
30 May, 2012 1 commit
- SVN_SILENT made messages (.desktop file) · 15f7c040
  Script Kiddy authored May 30, 2012
  
  15f7c040
06 Jan, 2012 1 commit
- SVN_SILENT made messages (.desktop file) · 6b71d8fc
  Script Kiddy authored Jan 06, 2012
  
  6b71d8fc
22 Dec, 2011 1 commit
- SVN_SILENT made messages (.desktop file) · 314ca3fc
  Script Kiddy authored Dec 22, 2011
  
  314ca3fc
21 Dec, 2011 1 commit
- SVN_SILENT made messages (.desktop file) · b69cf81d
  Script Kiddy authored Dec 21, 2011
  
  b69cf81d
20 Dec, 2011 1 commit
- SVN_SILENT made messages (.desktop file) · be7e0956
  Script Kiddy authored Dec 20, 2011
  
  be7e0956
19 Dec, 2011 1 commit
- SVN_SILENT made messages (.desktop file) · 72f5aa82
  Script Kiddy authored Dec 19, 2011
  
  72f5aa82
13 Sep, 2011 1 commit
- SVN_SILENT made messages (.desktop file) · 242658bf
  Script Kiddy authored Sep 13, 2011
  
  242658bf
09 Sep, 2011 1 commit
- SVN_SILENT made messages (.desktop file) · ea5ed988
  Script Kiddy authored Sep 09, 2011
  
  ea5ed988
08 Sep, 2011 1 commit
- SVN_SILENT made messages (.desktop file) · 9165bf4e
  Script Kiddy authored Sep 08, 2011
  
  9165bf4e
17 May, 2011 1 commit
- SVN_SILENT made messages (.desktop file) · c2e1b844
  Script Kiddy authored May 17, 2011
  
  c2e1b844
09 May, 2011 1 commit
- SVN_SILENT made messages (.desktop file) · 4de751da
  Script Kiddy authored May 09, 2011
  
  4de751da
03 Feb, 2011 1 commit
- SVN_SILENT made messages (.desktop file) · 186daa10
  Script Kiddy authored Feb 03, 2011
  
  186daa10
02 Feb, 2011 1 commit
- SVN_SILENT made messages (.desktop file) · b9018660
  Script Kiddy authored Feb 02, 2011
  
  b9018660
31 Oct, 2010 1 commit
- SVN_SILENT made messages (.desktop file) · a1ae9b1b
  Script Kiddy authored Oct 31, 2010
```
svn path=/trunk/KDE/kdebase/runtime/; revision=1191511
```
  a1ae9b1b
21 Sep, 2010 1 commit
- SVN_SILENT made messages (.desktop file) · bcd20909
  Script Kiddy authored Sep 21, 2010
```
svn path=/trunk/KDE/kdebase/runtime/; revision=1177799
```
  bcd20909