Merge branch 'master' into audioAlign

author Simon A. Eugster <simon.eu@gmail.com>

Thu, 19 Apr 2012 09:33:54 +0000 (11:33 +0200)

committer Simon A. Eugster <simon.eu@gmail.com>

Thu, 19 Apr 2012 09:33:54 +0000 (11:33 +0200)
author Simon A. Eugster <simon.eu@gmail.com>
Thu, 19 Apr 2012 09:33:54 +0000 (11:33 +0200)
committer Simon A. Eugster <simon.eu@gmail.com>
Thu, 19 Apr 2012 09:33:54 +0000 (11:33 +0200)
diff --cc src/customtrackview.cpp
Simple merge
diff --cc src/customtrackview.h
Simple merge
diff --cc src/definitions.h
Simple merge
diff --cc src/mainwindow.cpp
Simple merge
author	Simon A. Eugster <simon.eu@gmail.com>
	Thu, 19 Apr 2012 09:33:54 +0000 (11:33 +0200)
committer	Simon A. Eugster <simon.eu@gmail.com>
	Thu, 19 Apr 2012 09:33:54 +0000 (11:33 +0200)
		1	2
src/customtrackview.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
src/customtrackview.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/definitions.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/mainwindow.cpp	patch \|	diff1 \|	diff2 \|	blob \| history