Merge branch 'master' into save_message

author Ville Tiensuu <ville.tiensuu@ixonos.com>

Thu, 3 Jun 2010 12:19:43 +0000 (15:19 +0300)

committer Ville Tiensuu <ville.tiensuu@ixonos.com>

Thu, 3 Jun 2010 12:19:43 +0000 (15:19 +0300)
author Ville Tiensuu <ville.tiensuu@ixonos.com>
Thu, 3 Jun 2010 12:19:43 +0000 (15:19 +0300)
committer Ville Tiensuu <ville.tiensuu@ixonos.com>
Thu, 3 Jun 2010 12:19:43 +0000 (15:19 +0300)
diff --cc src/engine/engine.cpp
Simple merge
diff --cc src/engine/engine.h
Simple merge
diff --cc src/ui/mainwindow.cpp
Simple merge
diff --cc src/ui/mainwindow.h
Simple merge
author	Ville Tiensuu <ville.tiensuu@ixonos.com>
	Thu, 3 Jun 2010 12:19:43 +0000 (15:19 +0300)
committer	Ville Tiensuu <ville.tiensuu@ixonos.com>
	Thu, 3 Jun 2010 12:19:43 +0000 (15:19 +0300)
		1	2
src/engine/engine.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
src/engine/engine.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/ui/mainwindow.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
src/ui/mainwindow.h	patch \|	diff1 \|	diff2 \|	blob \| history