diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2011-01-27 01:31:03 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2011-01-27 01:31:03 +0000 |
| commit | 15b5fce90480490455237da917167b0bcb5ce946 (patch) | |
| tree | 5c1c5929a83c05db1a901e775fefe4f6cf8dc1b7 /libs/panners/vbap/vbap_speakers.cc | |
| parent | 1385643131a2b2231bbbc0c584c76883fcfb580a (diff) | |
merge 3.0-panexp (pan experiments) branch, revisions 8534-8585 into 3.0, thus ending 3.0-panexp. THIS COMMIT WILL BREAK ALL EXISTING 3.0 SESSIONS IN SOME WAY (possibly not fatally).
git-svn-id: svn://localhost/ardour2/branches/3.0@8586 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/panners/vbap/vbap_speakers.cc')
| -rw-r--r-- | libs/panners/vbap/vbap_speakers.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libs/panners/vbap/vbap_speakers.cc b/libs/panners/vbap/vbap_speakers.cc index 9090ed65e1..7e70e5df66 100644 --- a/libs/panners/vbap/vbap_speakers.cc +++ b/libs/panners/vbap/vbap_speakers.cc @@ -36,7 +36,8 @@ #include <stdlib.h> #include "pbd/cartesian.h" -#include "ardour/vbap_speakers.h" + +#include "vbap_speakers.h" using namespace ARDOUR; using namespace PBD; |