Commits · master · Unmaintained / Nepomuk Core

04 Nov, 2017 1 commit

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

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

36f4d67e

02 Nov, 2017 1 commit

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

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

d42f7052

29 Jul, 2017 1 commit

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

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

75795170

23 Feb, 2017 1 commit

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

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

2d78844d

30 Jan, 2017 1 commit

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

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

2f6c20c1

12 Apr, 2016 1 commit

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

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

085044be

18 Oct, 2015 1 commit

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

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

d425a53e

03 Apr, 2015 1 commit

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

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

2c168258

25 Feb, 2015 1 commit
- SVN_SILENT made messages (.desktop file) · 2302d77a
  Script Kiddy authored Feb 25, 2015
  
  2302d77a
25 Oct, 2014 1 commit
- SVN_SILENT made messages (.desktop file) · 7346263b
  Script Kiddy authored Oct 25, 2014
  
  7346263b
25 Jul, 2014 1 commit
- SVN_SILENT made messages (.desktop file) · d6bd673d
  Script Kiddy authored Jul 25, 2014
  
  d6bd673d
24 Jul, 2014 1 commit
- SVN_SILENT made messages (.desktop file) · 76f60c9f
  Script Kiddy authored Jul 24, 2014
  
  76f60c9f
30 Jun, 2014 1 commit
- SVN_SILENT made messages (.desktop file) · cd65262f
  Script Kiddy authored Jun 30, 2014
  
  cd65262f
27 Jun, 2014 1 commit
- SVN_SILENT made messages (.desktop file) · 9f659b8f
  Script Kiddy authored Jun 27, 2014
  
  9f659b8f
03 Jun, 2014 1 commit
- SVN_SILENT made messages (.desktop file) · 882127b8
  Script Kiddy authored Jun 03, 2014
  
  882127b8
17 May, 2014 1 commit
- SVN_SILENT made messages (.desktop file) · 50ee9d1d
  Script Kiddy authored May 17, 2014
  
  50ee9d1d
27 Apr, 2014 1 commit
- SVN_SILENT made messages (.desktop file) · 0ff58380
  Script Kiddy authored Apr 27, 2014
  
  0ff58380
08 Apr, 2014 1 commit
- SVN_SILENT made messages (.desktop file) · 80551b7b
  Script Kiddy authored Apr 08, 2014
  
  80551b7b
05 Apr, 2014 1 commit
- SVN_SILENT made messages (.desktop file) · 9de88a70
  Script Kiddy authored Apr 05, 2014
  
  9de88a70
04 Apr, 2014 1 commit
- SVN_SILENT made messages (.desktop file) · af1b645c
  Script Kiddy authored Apr 04, 2014
  
  af1b645c
02 Apr, 2014 1 commit
- SVN_SILENT made messages (.desktop file) · 3f91f0f8
  Script Kiddy authored Apr 02, 2014
  
  3f91f0f8
31 Mar, 2014 3 commits
- Merge remote-tracking branch 'origin/KDE/4.13' · a2d382a9
  Albert Astals Cid authored Apr 01, 2014
```
Conflicts:
	baloo/nepomukbaloomigrator.desktop
```
  a2d382a9
- Merge remote-tracking branch 'origin/KDE/4.12' into KDE/4.13 · 6babadf3
  Albert Astals Cid authored Apr 01, 2014
```
Conflicts:
	services/fileindexer/indexer/nepomukofficeextractor.desktop
```
  6babadf3
- Initialize variable · 60c8d712
  Albert Astals Cid authored Apr 01, 2014
  
  60c8d712
27 Mar, 2014 1 commit
- SVN_SILENT made messages (.desktop file) · 86011ffe
  Script Kiddy authored Mar 27, 2014
  
  86011ffe
26 Mar, 2014 1 commit
- SVN_SILENT made messages (.desktop file) · 1bee2677
  Script Kiddy authored Mar 26, 2014
  
  1bee2677
25 Mar, 2014 1 commit
- SVN_SILENT made messages (.desktop file) · 186c17cb
  Script Kiddy authored Mar 25, 2014
  
  186c17cb
24 Mar, 2014 1 commit
- SVN_SILENT made messages (.desktop file) · 2c650b4d
  Script Kiddy authored Mar 24, 2014
  
  2c650b4d
23 Mar, 2014 2 commits
- SVN_SILENT made messages (.desktop file) · 0489628e
  Script Kiddy authored Mar 23, 2014
  
  0489628e
- SVN_SILENT made messages (.desktop file) · a871b371
  Script Kiddy authored Mar 23, 2014
  
  a871b371
22 Mar, 2014 1 commit
- SVN_SILENT made messages (.desktop file) · 1b2798e3
  Script Kiddy authored Mar 22, 2014
  
  1b2798e3
21 Mar, 2014 1 commit
- SVN_SILENT made messages (.desktop file) · 90d18c50
  Script Kiddy authored Mar 21, 2014
  
  90d18c50
20 Mar, 2014 1 commit
- SVN_SILENT made messages (.desktop file) · c27785a6
  Script Kiddy authored Mar 20, 2014
  
  c27785a6
19 Mar, 2014 1 commit
- SVN_SILENT made messages (.desktop file) · fd398514
  Script Kiddy authored Mar 19, 2014
  
  fd398514
17 Mar, 2014 6 commits
- install nepomukbaloomigrator.desktop as a file so it does not get execure permissions · 63e3f865
  Jonathan Esk-Riddell authored Mar 17, 2014
  
  63e3f865
- install nepomukbaloomigrator.desktop as a file so it does not get execure permissions · 0a282978
  Jonathan Esk-Riddell authored Mar 17, 2014
  
  0a282978
- Add autostart file for baloo migrator · 549f1051
  Jonathan Esk-Riddell authored Mar 17, 2014
  
  549f1051
- Add autostart file for baloo migrator · 99810203
  Jonathan Esk-Riddell authored Mar 17, 2014
  
  99810203
- SVN_SILENT made messages (.desktop file) · 555e3da3
  Script Kiddy authored Mar 17, 2014
  
  555e3da3
- SVN_SILENT made messages (.desktop file) · c8269013
  Script Kiddy authored Mar 17, 2014
  
  c8269013