Merge branch '5.1'
- Conflicts:
- languages/clang/codecompletion/context.cpp
kossebau | Jun 28 2017, 10:26 PM |
Commit | Author | Details | Committed | |||
---|---|---|---|---|---|---|
1cea19e20c08 | kossebau | Fix syntax typo in test data | Jun 28 2017 | |||
fcba0ad8ae38 | D6417 | kossebau | Avoid duplicates in virtual overrides code completion proposals | Jun 28 2017 | ||
ea3ad93da80c | kossebau | Rename isVirtual -> isPureVirtual, for non-confusing name | Jun 28 2017 | |||
1b157dfdeb9e | l10n daemon script | SVN_SILENT made messages (.desktop file) - always resolve ours | Jun 27 2017 | |||
524cfcccf50f | l10n daemon script | SVN_SILENT made messages (.desktop file) - always resolve ours | Jun 26 2017 | |||
d165e58c317d | D6371 | croick/kfunk | Fix enabling of SpinBox for number of threads in Make settings | Jun 25 2017 | ||
0bd3be87b0c6 | kossebau | Change deprecated QString::null to QString() | Jun 21 2017 | |||
b6c7e73cec7f | l10n daemon script | SVN_SILENT made messages (.desktop file) - always resolve ours | Jun 21 2017 | |||
580c39e9ef40 | l10n daemon script | SVN_SILENT made messages (.desktop file) - always resolve ours | Jun 20 2017 |