Merge branch 'master' into cairocanvas

author Paul Davis <paul@linuxaudiosystems.com>

Thu, 2 Jan 2014 14:16:28 +0000 (09:16 -0500)

committer Paul Davis <paul@linuxaudiosystems.com>

Thu, 2 Jan 2014 14:16:28 +0000 (09:16 -0500)
author Paul Davis <paul@linuxaudiosystems.com>
Thu, 2 Jan 2014 14:16:28 +0000 (09:16 -0500)
committer Paul Davis <paul@linuxaudiosystems.com>
Thu, 2 Jan 2014 14:16:28 +0000 (09:16 -0500)
diff --cc libs/ardour/ardour/iec1ppmdsp.h
Simple merge
diff --cc libs/ardour/ardour/iec2ppmdsp.h
Simple merge
diff --cc libs/ardour/ardour/kmeterdsp.h
Simple merge
diff --cc libs/ardour/ardour/plugin_insert.h
Simple merge
diff --cc libs/ardour/ardour/vumeterdsp.h
Simple merge
diff --cc libs/ardour/audioregion.cc
Simple merge
author	Paul Davis <paul@linuxaudiosystems.com>
	Thu, 2 Jan 2014 14:16:28 +0000 (09:16 -0500)
committer	Paul Davis <paul@linuxaudiosystems.com>
	Thu, 2 Jan 2014 14:16:28 +0000 (09:16 -0500)
		1	2
libs/ardour/ardour/iec1ppmdsp.h	patch \|	diff1 \|	diff2 \|	blob \| history
libs/ardour/ardour/iec2ppmdsp.h	patch \|	diff1 \|	diff2 \|	blob \| history
libs/ardour/ardour/kmeterdsp.h	patch \|	diff1 \|	diff2 \|	blob \| history
libs/ardour/ardour/plugin_insert.h	patch \|	diff1 \|	diff2 \|	blob \| history
libs/ardour/ardour/vumeterdsp.h	patch \|	diff1 \|	diff2 \|	blob \| history
libs/ardour/audioregion.cc	patch \|	diff1 \|	diff2 \|	blob \| history