[SCM] Audacity debian packaging branch, master, updated. debian/1.3.11-2-10-gaf35937

[bdrung-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 0f91af9125d8cb594dadd235e82107708879b997
Merge: 2c0edafc0402bf390440f7990fc7fdb3ecb71830 a5af98dae1a6e0cf630a4f5406fbf9a9da2c92b9
Author: Benjamin Drung <bdrung at gmail.com>
Date:   Fri Apr 2 00:28:23 2010 +0200

    Merge commit 'upstream/1.3.12'

diff --combined src/Experimental.h
index 7d5d7c3,45e783a..7b6ea6b
--- a/src/Experimental.h
+++ b/src/Experimental.h
@@@ -28,7 -28,7 +28,7 @@@
  #define __EXPERIMENTAL__
  
  //uncomment the next line to enable the feature to link audio tracks to a label track
 -//#define EXPERIMENTAL_LINKING
 +#define EXPERIMENTAL_LINKING
  
  //Uncomment the next #define to enable experimental features.
  #define EXPERIMENTAL_FEATURES
@@@ -83,6 -83,8 +83,8 @@@
  // have not been fully imported in builds without FLAC support, so disabled for
  // 2.0 release
  //#define EXPERIMENTAL_OD_FLAC
+ // similarly for FFmpeg:
+ //#define EXPERIMENTAL_OD_FFMPEG
  
  // Philip Van Baren 01 July 2009
  // Replace RealFFT() and PowerSpectrum function to use (faster) RealFFTf function
@@@ -126,7 -128,7 +128,7 @@@
  #endif
  
  //If you want any of these files, ask JKC.  They are not
- //yet checked in to Audacity CVS as of 10-Oct-2004
+ //yet checked in to Audacity SVN as of 12-Feb-2010
  #ifdef EXPERIMENTAL_NOTEBOOK
  #include "widgets/GuiFactory.h"
  #include "widgets/APanel.h"
@@@ -148,7 -150,8 +150,8 @@@ extern void AddPages(   AudacityProjec
     //#define AUTOMATED_INPUT_LEVEL_ADJUSTMENT
  #endif
  
- //#define EXPERIMENTAL_EQ_INVERT // MJS, 30th Dec 2009.  Add a button to EQ to allow inverting of any curve.
+ // AWD: new Truncate Silence code
+ //#define EXPERIMENTAL_TRUNC_SILENCE
  
  #endif
  

-- 
Audacity debian packaging