Commits · dc7bb9e7f5f945f50ebde0052ed65a8b32cfc8a9 · KDevelop / KDevelop Ruby Support

18 Nov, 2016 1 commit
- Fix JSON file, avoid runtime warning · dc7bb9e7
  Kevin Funk authored Aug 26, 2016
  
  dc7bb9e7
26 Aug, 2016 1 commit
- Fix JSON file, avoid runtime warning · ba7aaa1a
  Kevin Funk authored Aug 26, 2016
  
  ba7aaa1a
22 Nov, 2015 1 commit

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

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

b4fab317

17 Nov, 2015 1 commit

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

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

71c20211

04 Nov, 2015 1 commit

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

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"

c969b742

21 Sep, 2015 1 commit

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

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

808ce345

24 Jun, 2015 1 commit

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

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"

60716e95

17 Apr, 2015 1 commit

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

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

5d00d23d

06 Apr, 2015 1 commit

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

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"

cc2661c6

04 Apr, 2015 1 commit

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

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

a16c9226

31 Mar, 2015 1 commit

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

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

41e2ca7c

29 Mar, 2015 1 commit

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

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

d52ad919

27 Mar, 2015 1 commit

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

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

d1481336

26 Mar, 2015 1 commit

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

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

1e59780c

25 Mar, 2015 1 commit

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

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

22d22d88

05 Mar, 2015 1 commit
- Ported plugin to JSON. · f69dfc40
  Miquel Sabaté authored Mar 05, 2015
  
  f69dfc40