@helihyv
Heli Hyvättinen and helihyv Raised the version number of C++ types registered to QML to 1.2
5f04a49 Aug 13, 2013
Raised the version number of C++ types registered to QML to 1.2 
Conflicts:
	qml/CountYourScores/CreateNumberSetPage.qml
	qml/CountYourScores/MainPage.qml
	qml/CountYourScores/SettingsPage.qml
	qml/CountYourScores/main.qml
5f04a49