Merge branch '5.1'

Authored by kossebau on Apr 20 2017, 1:01 PM.

Description

Merge branch '5.1'

  1. Conflicts:
  2. app_templates/cpp/CMake/cmake_qt4core/%{PROJECTDIRNAME}.kdev4
  3. app_templates/cpp/CMake/cmake_qt4core_qtest/%{PROJECTDIRNAME}.kdev4
  4. app_templates/cpp/CMake/cmake_qt4gui/%{PROJECTDIRNAME}.kdev4

Merged Changes

CommitAuthorDetailsCommitted
0f3810caa8d4D5512kossebau
Remove unused "VersionControl" entries from kdev4 samples/templates 
Apr 20 2017
913bc13360e4flherne
Revert "Improve wording of appdata summary" 
Apr 18 2017
49700a4e84c7flherne
Improve wording of appdata summary 
Apr 18 2017