diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2009-10-01 15:33:23 +0000 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2009-10-01 15:33:23 +0000 |
commit | a0d4c9b392d021218f5a0e1b79d0011f7191134c (patch) | |
tree | 0ef3e66e19869e5f25507db488e93903c03726f2 /libs/surfaces/control_protocol | |
parent | 49a9fa20a56c6f5607e7bcf209985a67972c3f31 (diff) |
merge 5674:5682 and 5689-5694 from mixbus branch
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@5695 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/surfaces/control_protocol')
-rw-r--r-- | libs/surfaces/control_protocol/SConscript | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/surfaces/control_protocol/SConscript b/libs/surfaces/control_protocol/SConscript index df212ca718..4ae3406b8f 100644 --- a/libs/surfaces/control_protocol/SConscript +++ b/libs/surfaces/control_protocol/SConscript @@ -34,7 +34,7 @@ cp.Append(CPPPATH = libraries['jack'].get('CPPPATH', [])) cp.Merge ([ libraries['ardour'], - libraries['sndfile-ardour'], + libraries['sndfile'], libraries['sigc2'], libraries['pbd'], libraries['midi++2'], |