Conflicts:
	CMakeLists.txt
	libs/koreport/items/check/KoReportScriptCheck.cpp
	libs/koreport/items/check/KoReportScriptCheck.h
	libs/koreport/items/field/KoReportItemField.h
	libs/koreport/items/field/krscriptfield.cpp
	libs/koreport/items/field/krscriptfield.h
	libs/koreport/items/image/KoReportItemImage.h
	libs/koreport/items/image/krscriptimage.cpp
	libs/koreport/items/image/krscriptimage.h
	libs/koreport/items/label/KoReportItemLabel.h
	libs/koreport/items/label/krscriptlabel.cpp
	libs/koreport/items/label/krscriptlabel.h
	libs/koreport/items/text/KoReportItemText.h
	libs/koreport/items/text/krscripttext.cpp
	libs/koreport/items/text/krscripttext.h
	libs/koreport/renderer/scripting/krscriptconstants.h
	libs/koreport/renderer/scripting/krscriptdebug.h
	libs/koreport/renderer/scripting/krscriptdraw.h
	libs/koreport/renderer/scripting/krscriptline.cpp
	libs/koreport/renderer/scripting/krscriptline.h
	libs/koreport/renderer/scripting/krscriptreport.cpp
	libs/koreport/renderer/scripting/krscriptreport.h
	libs/koreport/renderer/scripting/krscriptsection.cpp
	libs/koreport/renderer/scripting/krscriptsection.h
	libs/main/KoFindToolbar.cpp
	plugins/textediting/spellcheck/SpellCheckMenu.h