merge conflicts

author Ivailo Monev <xakepa10@gmail.com>

Wed, 2 Mar 2016 03:43:17 +0000 (05:43 +0200)

committer Ivailo Monev <xakepa10@gmail.com>

Wed, 2 Mar 2016 03:43:17 +0000 (05:43 +0200)
author Ivailo Monev <xakepa10@gmail.com>
Wed, 2 Mar 2016 03:43:17 +0000 (05:43 +0200)
committer Ivailo Monev <xakepa10@gmail.com>
Wed, 2 Mar 2016 03:43:17 +0000 (05:43 +0200)
diff --cc CMakeLists.txt
Simple merge
diff --cc src/gui/kernel/kernel.cmake
Simple merge
author	Ivailo Monev <xakepa10@gmail.com>
	Wed, 2 Mar 2016 03:43:17 +0000 (05:43 +0200)
committer	Ivailo Monev <xakepa10@gmail.com>
	Wed, 2 Mar 2016 03:43:17 +0000 (05:43 +0200)
		1	2
CMakeLists.txt	patch \|	diff1 \|	diff2 \|	blob \| history
src/gui/kernel/kernel.cmake	patch \|	diff1 \|	diff2 \|	blob \| history