Commit fb94b437 authored by Kevin Funk's avatar Kevin Funk
Browse files

Merge remote-tracking branch 'origin/4.7'

Conflicts:
	CMakeLists.txt
	formatters/customscript/kdevcustomscript.desktop.cmake
parents 183b1f92 13c956c8
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment