Merge branch '5.2'
4abe80c5387a
Actions

Authored by flherne on Sep 6 2017, 8:34 AM.

Description

Merge branch '5.2'

Committed

flherne

Sep 6 2017, 8:36 AM

Parents

Branches

Unknown

Tags

Unknown

	Commit			Author	Details	Committed
	e92d8f0f853f			kfunk/flherne	TypeRepository: Bail out of comparing to types with no loaded factory.	Sep 5 2017
	b535b60781b4			kfunk	astyle: Move libastyle to 3rdparty subdir	Sep 5 2017

		Path
A	(dir)	formatters/astyle/3rdparty/
V	(dir)	formatters/astyle/{3rdparty/libastyle/ ← lib}
V		formatters/astyle/{3rdparty/libastyle ← lib}/ASBeautifier.cpp
V		formatters/astyle/{3rdparty/libastyle ← lib}/ASEnhancer.cpp
V		formatters/astyle/{3rdparty/libastyle ← lib}/ASFormatter.cpp
V		formatters/astyle/{3rdparty/libastyle ← lib}/ASLocalizer.cpp
V		formatters/astyle/{3rdparty/libastyle ← lib}/ASLocalizer.h
V		formatters/astyle/{3rdparty/libastyle ← lib}/ASResource.cpp
V		formatters/astyle/{3rdparty/libastyle ← lib}/CMakeLists.txt
V		formatters/astyle/{3rdparty/libastyle ← lib}/README
V		formatters/astyle/{3rdparty/libastyle ← lib}/astyle.h
M		formatters/astyle/CMakeLists.txt
V	(dir)	formatters/astyle/{lib/ → 3rdparty/libastyle}
V		formatters/astyle/{lib → 3rdparty/libastyle}/ASBeautifier.cpp
V		formatters/astyle/{lib → 3rdparty/libastyle}/ASEnhancer.cpp
V		formatters/astyle/{lib → 3rdparty/libastyle}/ASFormatter.cpp
V		formatters/astyle/{lib → 3rdparty/libastyle}/ASLocalizer.cpp
V		formatters/astyle/{lib → 3rdparty/libastyle}/ASLocalizer.h
V		formatters/astyle/{lib → 3rdparty/libastyle}/ASResource.cpp
V		formatters/astyle/{lib → 3rdparty/libastyle}/CMakeLists.txt
V		formatters/astyle/{lib → 3rdparty/libastyle}/README
V		formatters/astyle/{lib → 3rdparty/libastyle}/astyle.h
M		kdevplatform/language/duchain/types/typerepository.cpp