Merge branch 'master' into cairocanvas
authorPaul Davis <paul@linuxaudiosystems.com>
Thu, 2 Jan 2014 14:16:28 +0000 (09:16 -0500)
committerPaul Davis <paul@linuxaudiosystems.com>
Thu, 2 Jan 2014 14:16:28 +0000 (09:16 -0500)
commite7c47747286c16aa575456b07120e1e8e8271bd5
tree7b74a91fcf5685271f2b90d57a3658c4051dbe84
parent393ff4015349318b404d9e799292ce194645df09
parentb439b79813a562278e5fc9ac088e4ca1fbf9f6cb
Merge branch 'master' into cairocanvas
libs/ardour/ardour/iec1ppmdsp.h
libs/ardour/ardour/iec2ppmdsp.h
libs/ardour/ardour/kmeterdsp.h
libs/ardour/ardour/plugin_insert.h
libs/ardour/ardour/vumeterdsp.h
libs/ardour/audioregion.cc