From: maan <maan@Gumbo.local>
Date: Thu, 15 Jun 2006 08:17:41 +0000 (+0200)
Subject: Merge branch 'master' into my-osx
X-Git-Tag: v0.2.14~62
X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=27638103f249ffbe9768603b9baff199950fd9f6

Merge branch 'master' into my-osx
---

27638103f249ffbe9768603b9baff199950fd9f6
diff --cc error.h
index a64348e3,78e3242c..89dbb0f6
--- a/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