From c824834873a2af00b78d071be3265b958003d16c Mon Sep 17 00:00:00 2001
From: Stefan Sayer <stefan.sayer@googlemail.com>
Date: Tue, 29 Jun 2010 23:35:45 +0200
Subject: [PATCH] documentation for playMixIn

---
 apps/dsm/mods/mod_conference/Readme.mod_conference.txt | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/apps/dsm/mods/mod_conference/Readme.mod_conference.txt b/apps/dsm/mods/mod_conference/Readme.mod_conference.txt
index 7a406018..9dd2c506 100644
--- a/apps/dsm/mods/mod_conference/Readme.mod_conference.txt
+++ b/apps/dsm/mods/mod_conference/Readme.mod_conference.txt
@@ -45,3 +45,6 @@ conference.setupMixIn(float level, unsigned int seconds)
      o if you use setupMixIn multiple times, use setInOutPlaylist first!!!!!
        otherwise it could crash if old MixIn is still in the output / 
        the audio queue
+
+conference.playMixIn(string filename)
+    - mix in a file