Merge branch 'master' into locationlistview

author Jussi Laitinen <jupe@l3l7588.ixonos.local>

Fri, 30 Jul 2010 10:23:57 +0000 (13:23 +0300)

committer Jussi Laitinen <jupe@l3l7588.ixonos.local>

Fri, 30 Jul 2010 10:23:57 +0000 (13:23 +0300)
author Jussi Laitinen <jupe@l3l7588.ixonos.local>
Fri, 30 Jul 2010 10:23:57 +0000 (13:23 +0300)
committer Jussi Laitinen <jupe@l3l7588.ixonos.local>
Fri, 30 Jul 2010 10:23:57 +0000 (13:23 +0300)
diff --cc src/engine/engine.cpp
Simple merge
diff --cc src/engine/engine.h
Simple merge
diff --cc src/src.pro
Simple merge
diff --cc src/ui/mainwindow.cpp
Simple merge
diff --cc src/ui/mainwindow.h
Simple merge
author	Jussi Laitinen <jupe@l3l7588.ixonos.local>
	Fri, 30 Jul 2010 10:23:57 +0000 (13:23 +0300)
committer	Jussi Laitinen <jupe@l3l7588.ixonos.local>
	Fri, 30 Jul 2010 10:23:57 +0000 (13:23 +0300)
		1	2
src/engine/engine.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
src/engine/engine.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/src.pro	patch \|	diff1 \|	diff2 \|	blob \| history
src/ui/mainwindow.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
src/ui/mainwindow.h	patch \|	diff1 \|	diff2 \|	blob \| history