Merge branch 'master' into my-osx
authormaan <maan@Gumbo.local>
Thu, 15 Jun 2006 08:17:41 +0000 (10:17 +0200)
committermaan <maan@Gumbo.local>
Thu, 15 Jun 2006 08:17:41 +0000 (10:17 +0200)
1  2 
configure.ac
error.h

diff --cc configure.ac
Simple merge
diff --cc error.h
+++ b/error.h
@@@ -556,9 -554,9 +564,10 @@@ SS_ENUM(WRITE)
  SS_ENUM(WRITE_COMMON);
  SS_ENUM(ALSA_WRITER);
  SS_ENUM(FILE_WRITER);
 +SS_ENUM(OSX_WRITER);
  SS_ENUM(RINGBUFFER);
  SS_ENUM(CLIENT);
+ SS_ENUM(CLIENT_COMMON);
  SS_ENUM(AUDIOC);
  /** \endcond */
  #undef PARA_ERROR