I communicated it to Erik as well and he's already fixed in upstream. Vaughan Johnson wrote: > Update of /cvsroot/audacity/lib-src/libsamplerate/Win32 > In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv22421 > > Modified Files: > config.h > Log Message: > Get rid of some diff cruft that broke Windows build. > > Index: config.h > =================================================================== > RCS file: /cvsroot/audacity/lib-src/libsamplerate/Win32/config.h,v > retrieving revision 1.5 > retrieving revision 1.6 > diff -u -d -r1.5 -r1.6 > --- config.h 14 Feb 2009 22:13:50 -0000 1.5 > +++ config.h 15 Feb 2009 01:31:44 -0000 1.6 > @@ -190,10 +190,7 @@ > #define STDC_HEADERS 1 > > /* Version number of package */ > -<<<<<<< diff from left file > -#define VERSION "0.1.4" > - > - > +#define VERSION "0.1.7" > > /* Extra Win32 hacks. */ > > @@ -203,6 +200,3 @@ > */ > > #define inline __inline > -======== > -#define VERSION "0.1.7" > ->>>>>>> diff from right file > > > ------------------------------------------------------------------------------ > Open Source Business Conference (OSBC), March 24-25, 2009, San Francisco, CA > -OSBC tackles the biggest issue in open source: Open Sourcing the Enterprise > -Strategies to boost innovation and cut costs with open source participation > -Receive a $600 discount off the registration fee with the source code: SFAD > http://p.sf.net/sfu/XcvMzF8H > _______________________________________________ > Audacity-cvs mailing list > [email protected] > https://lists.sourceforge.net/lists/listinfo/audacity-cvs > >
------------------------------------------------------------------------------ Open Source Business Conference (OSBC), March 24-25, 2009, San Francisco, CA -OSBC tackles the biggest issue in open source: Open Sourcing the Enterprise -Strategies to boost innovation and cut costs with open source participation -Receive a $600 discount off the registration fee with the source code: SFAD http://p.sf.net/sfu/XcvMzF8H _______________________________________________ Audacity-cvs mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/audacity-cvs
