Merge branch '5.1'

Authored by kossebau on Jun 28 2017, 10:26 PM.

Description

Merge branch '5.1'

  1. Conflicts:
  2. languages/clang/codecompletion/context.cpp

Details

Merged Changes

CommitAuthorDetailsCommitted
1cea19e20c08kossebau
Fix syntax typo in test data 
Jun 28 2017
fcba0ad8ae38D6417kossebau
Avoid duplicates in virtual overrides code completion proposals 
Jun 28 2017
ea3ad93da80ckossebau
Rename isVirtual -> isPureVirtual, for non-confusing name 
Jun 28 2017
1b157dfdeb9el10n daemon script
SVN_SILENT made messages (.desktop file) - always resolve ours 
Jun 27 2017
524cfcccf50fl10n daemon script
SVN_SILENT made messages (.desktop file) - always resolve ours 
Jun 26 2017
d165e58c317dD6371croick/kfunk
Fix enabling of SpinBox for number of threads in Make settings 
Jun 25 2017
0bd3be87b0c6kossebau
Change deprecated QString::null to QString() 
Jun 21 2017
b6c7e73cec7fl10n daemon script
SVN_SILENT made messages (.desktop file) - always resolve ours 
Jun 21 2017
580c39e9ef40l10n daemon script
SVN_SILENT made messages (.desktop file) - always resolve ours 
Jun 20 2017