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
25 Aug, 2016 4 commits
- Merge remote-tracking branch 'origin/1.7' into 5.0 · f40413ff
  Kevin Funk authored Aug 25, 2016
  
  f40413ff
- Fix CMake issue · 2afa87ad
  Kevin Funk authored Aug 25, 2016
```
Problem:
CMake Error at parser/CMakeLists.txt:27 (if):
  if given arguments:

    "STREQUAL" "Debug"
```
  2afa87ad
- Fix crash on accessing nullptr · 471fecc8
  Kevin Funk authored Aug 25, 2016
  
  471fecc8
- Adapt to new kdevplatform API · 3b60bff7
  Kevin Funk authored Aug 25, 2016
  
  3b60bff7
24 Jan, 2016 1 commit
- Unset Parser::ast when the it fails to parse the file correctly · ed4ad738
  Daniel Vrátil authored Jan 24, 2016
```
Fixes a crash when such Parser is being deleted.

REVIEW: 126854
```
  ed4ad738
23 Jan, 2016 1 commit
- Adapt to KDevplatform changes. · 03785a9a
  Milian Wolff authored Jan 23, 2016
  
  03785a9a
06 Jan, 2016 1 commit

"Fix" build with Clang, remove -Werror · b8d7c7b3

Kevin Funk authored Jan 06, 2016

-Werror is never a good idea.
See: https://blog.flameeyes.eu/2009/02/future-proof-your-code-dont-use-werror

b8d7c7b3

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

03 Aug, 2015 1 commit
- Make compile · 5afbff87
  Kevin Funk authored Aug 03, 2015
  
  5afbff87
25 Jul, 2015 1 commit
- Adapt to kdevplatform changes · 28b65856
  Kevin Funk authored Jul 25, 2015
  
  28b65856
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 2 commits
- Add KPluginFactory include · dcb6cfd4
  Dāvis Mosāns authored Mar 29, 2015
```
REVIEW: 123175
```
  dcb6cfd4
- 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 2 commits
- 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
- CMake: Cleanup · 68ff6e20
  Kevin Funk authored Mar 25, 2015
  
  68ff6e20
24 Mar, 2015 1 commit
- duchain/declarations: added a missing "override". · cddb5f4c
  Miquel Sabaté authored Mar 24, 2015
  
  cddb5f4c
05 Mar, 2015 1 commit
- Ported plugin to JSON. · f69dfc40
  Miquel Sabaté authored Mar 05, 2015
  
  f69dfc40
04 Mar, 2015 1 commit
- duchain/declarations: inSymbolTable() => d_func()->m_inSymbolTable. · 8e5d0ae0
  Miquel Sabaté authored Mar 04, 2015
```
Thus fixing a crash.
```
  8e5d0ae0
02 Mar, 2015 1 commit
- SVN_SILENT made messages (.desktop file) · 6797f476
  Script Kiddy authored Mar 02, 2015
  
  6797f476
28 Feb, 2015 1 commit
- SVN_SILENT made messages (.desktop file) · 6b75d33b
  Script Kiddy authored Feb 28, 2015
  
  6b75d33b
27 Feb, 2015 1 commit
- SVN_SILENT made messages (.desktop file) · 75256f8a
  Script Kiddy authored Feb 27, 2015
  
  75256f8a
22 Feb, 2015 1 commit
- SVN_SILENT made messages (.desktop file) · 1ff763a8
  Script Kiddy authored Feb 22, 2015
  
  1ff763a8
08 Jan, 2015 4 commits
- Cleanup: Handled by KDECompilerSettings.cmake · 95828c00
  Kevin Funk authored Jan 08, 2015
  
  95828c00
- Make compile · 8690a973
  Kevin Funk authored Jan 08, 2015
  
  8690a973
- Fix wrong if-condition · 5156dad8
  Kevin Funk authored Jan 08, 2015
  
  5156dad8
- Adapt to kdevplatform changes · c6422bf0
  Kevin Funk authored Jan 08, 2015
  
  c6422bf0
06 Jan, 2015 1 commit
- Updated the copyright header to 2015. · f0edf559
  Miquel Sabaté authored Jan 06, 2015
  
  f0edf559
31 Dec, 2014 1 commit
- SVN_SILENT made messages (.desktop file) · 6ed00171
  Script Kiddy authored Dec 31, 2014
  
  6ed00171
18 Dec, 2014 1 commit
- rails: don't assert if quickopen is not loaded. · 17d49a78
  Miquel Sabaté authored Dec 18, 2014
```
This way we avoid crashing when using the `duchainify` tool.
```
  17d49a78