Merge branch 'Applications/15.08'

author Emmanuel Pescosta <emmanuelpescosta099@gmail.com>

Mon, 9 Nov 2015 08:33:20 +0000 (09:33 +0100)

committer Emmanuel Pescosta <emmanuelpescosta099@gmail.com>

Mon, 9 Nov 2015 08:33:20 +0000 (09:33 +0100)
author Emmanuel Pescosta <emmanuelpescosta099@gmail.com>
Mon, 9 Nov 2015 08:33:20 +0000 (09:33 +0100)
committer Emmanuel Pescosta <emmanuelpescosta099@gmail.com>
Mon, 9 Nov 2015 08:33:20 +0000 (09:33 +0100)
diff --cc CMakeLists.txt
Simple merge
diff --cc src/dolphinmainwindow.cpp
Simple merge
author	Emmanuel Pescosta <emmanuelpescosta099@gmail.com>
	Mon, 9 Nov 2015 08:33:20 +0000 (09:33 +0100)
committer	Emmanuel Pescosta <emmanuelpescosta099@gmail.com>
	Mon, 9 Nov 2015 08:33:20 +0000 (09:33 +0100)
		1	2
CMakeLists.txt	patch \|	diff1 \|	diff2 \|	blob \| history
src/dolphinmainwindow.cpp	patch \|	diff1 \|	diff2 \|	blob \| history