Merge branch 'master' into timeout

author lampehe-local <henri.lampela@ixonos.com>

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

committer lampehe-local <henri.lampela@ixonos.com>

Thu, 3 Jun 2010 12:12:46 +0000 (15:12 +0300)
author lampehe-local <henri.lampela@ixonos.com>
Thu, 3 Jun 2010 12:12:46 +0000 (15:12 +0300)
committer lampehe-local <henri.lampela@ixonos.com>
Thu, 3 Jun 2010 12:12:46 +0000 (15:12 +0300)
diff --cc src/ui/mainwindow.cpp
Simple merge
diff --cc src/ui/mainwindow.h
Simple merge
author	lampehe-local <henri.lampela@ixonos.com>
	Thu, 3 Jun 2010 12:12:46 +0000 (15:12 +0300)
committer	lampehe-local <henri.lampela@ixonos.com>
	Thu, 3 Jun 2010 12:12:46 +0000 (15:12 +0300)
		1	2
src/ui/mainwindow.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
src/ui/mainwindow.h	patch \|	diff1 \|	diff2 \|	blob \| history