diff options
| author | Stéphane Letz <letz@macsteph.grame.fr> | 2010-02-10 15:54:18 +0100 |
|---|---|---|
| committer | Stéphane Letz <letz@macsteph.grame.fr> | 2010-02-10 15:54:18 +0100 |
| commit | 1d5712a579cb9cb21792750ba47e8f9ec7b49c1c (patch) | |
| tree | fe17b454e0c92ef806f8204d654a46c6f1bbba43 /common/JackNetOneDriver.cpp | |
| parent | 66c14ab5bfd41c452c90c7fe260d26ac34d0f765 (diff) | |
| parent | d060e55d304404977d50765fa3606d55497001bc (diff) | |
| download | jack2-1d5712a579cb9cb21792750ba47e8f9ec7b49c1c.tar.gz | |
Fix merge conflicts.
Diffstat (limited to 'common/JackNetOneDriver.cpp')
| -rw-r--r-- | common/JackNetOneDriver.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/common/JackNetOneDriver.cpp b/common/JackNetOneDriver.cpp index 5ee20a6d..3259b563 100644 --- a/common/JackNetOneDriver.cpp +++ b/common/JackNetOneDriver.cpp @@ -17,8 +17,6 @@ along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -//#define HAVE_CELT 1 - #ifdef WIN32 #include <malloc.h> #endif |