Merge branch '5.1'
- Conflicts:
- app_templates/cpp/CMake/cmake_qt4core/%{PROJECTDIRNAME}.kdev4
- app_templates/cpp/CMake/cmake_qt4core_qtest/%{PROJECTDIRNAME}.kdev4
- app_templates/cpp/CMake/cmake_qt4gui/%{PROJECTDIRNAME}.kdev4
kossebau | Apr 20 2017, 1:01 PM |
Commit | Author | Details | Committed | |||
---|---|---|---|---|---|---|
0f3810caa8d4 | D5512 | kossebau | Remove unused "VersionControl" entries from kdev4 samples/templates | Apr 20 2017 | ||
913bc13360e4 | flherne | Revert "Improve wording of appdata summary" | Apr 18 2017 | |||
49700a4e84c7 | flherne | Improve wording of appdata summary | Apr 18 2017 |