Merge branch 'master' into feature/pkey

author Ed Rogalsky <ed.rogalsky@googlemail.com>

Thu, 25 Oct 2012 21:09:17 +0000 (23:09 +0200)

committer Ed Rogalsky <ed.rogalsky@googlemail.com>

Thu, 25 Oct 2012 21:09:17 +0000 (23:09 +0200)
author Ed Rogalsky <ed.rogalsky@googlemail.com>
Thu, 25 Oct 2012 21:09:17 +0000 (23:09 +0200)
committer Ed Rogalsky <ed.rogalsky@googlemail.com>
Thu, 25 Oct 2012 21:09:17 +0000 (23:09 +0200)
diff --cc src/customtrackview.cpp
Simple merge
diff --cc src/customtrackview.h
Simple merge
diff --cc src/mainwindow.cpp
Simple merge
author	Ed Rogalsky <ed.rogalsky@googlemail.com>
	Thu, 25 Oct 2012 21:09:17 +0000 (23:09 +0200)
committer	Ed Rogalsky <ed.rogalsky@googlemail.com>
	Thu, 25 Oct 2012 21:09:17 +0000 (23:09 +0200)
		1	2
src/customtrackview.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
src/customtrackview.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/mainwindow.cpp	patch \|	diff1 \|	diff2 \|	blob \| history