Merge remote-tracking branch 'origin/master'

BearWare · Nov 25, 2015 · 77d044e · 77d044e
2 parents ec0f1ba + 01e2bd8
commit 77d044e
Show file tree

Hide file tree

Showing 6 changed files with 542 additions and 200 deletions.
diff --git a/ChangeLog.txt b/ChangeLog.txt
@@ -1,6 +1,10 @@
 ----------------------------------------------
                  TeamTalk
 ----------------------------------------------
+Version 5.x unreleased
+Accessible client:
+- Portuguese_BR updated
+
 Version 5.1.1, released 2015/10/02
 Default Qt client:
 - Added -cfg command line argument for new/existing ini-file

diff --git a/README.md b/README.md
@@ -15,7 +15,7 @@ TeamTalk 5 SDK to obtain the client and server binaries.
   * [Debian 7 64-bit](http://bearware.dk/test/TeamTalk5SDK/v5.1.0.4236/tt5sdk_v5.1.0.4236_debian7_x86_64.tar.gz) **rev. 4236**
   * [Raspberry Pi (armhf)](http://bearware.dk/test/TeamTalk5SDK/v5.1.0.4236/tt5sdk_v5.1.0.4236_raspbian_armhf.tar.gz) **rev. 4236**
   * [Android arm-v7](http://bearware.dk/test/TeamTalk5SDK/v5.1.0.4223/tt5sdk_v5.1.0.4223_android_armv7a.tar.gz)  **rev. 4223**
-  * [iOS 7.0+ universal](http://bearware.dk/test/TeamTalk5SDK/v5.1.0.4223/tt5sdk_v5.1.0.4223_ios_universal.tar.gz)  **rev. 4223**
+  * [iOS 7.0+ universal](http://bearware.dk/test/TeamTalk5SDK/v5.1.2.4358/tt5sdk_v5.1.2.4358_ios_universal.tar.gz)  **rev. 4358**
 * TeamTalk 5 SDK Professional Edition - **Beta** releases
   * [Windows 32-bit](http://bearware.dk/test/TeamTalk5SDK/v5.1.0.4236/tt5prosdk_v5.1.0.4236_win32.zip)  **rev. 4236**
   * [Windows 64-bit](http://bearware.dk/test/TeamTalk5SDK/v5.1.0.4236/tt5prosdk_v5.1.0.4236_win64.zip)  **rev. 4236**
@@ -24,7 +24,7 @@ TeamTalk 5 SDK to obtain the client and server binaries.
   * [Debian 7 64-bit](http://bearware.dk/test/TeamTalk5SDK/v5.1.0.4236/tt5prosdk_v5.1.0.4236_debian7_x86_64.tar.gz) **rev. 4236**
   * [Raspberry Pi](http://bearware.dk/test/TeamTalk5SDK/v5.1.0.4236/tt5prosdk_v5.1.0.4236_raspbian_armhf.tar.gz) **rev. 4236**
   * [Android arm-v7](http://bearware.dk/test/TeamTalk5SDK/v5.1.0.4223/tt5prosdk_v5.1.0.4223_android_armv7a.tar.gz)  **rev. 4223**
-  * [iOS 7.0+ universal](http://bearware.dk/test/TeamTalk5SDK/v5.1.0.4223/tt5prosdk_v5.1.0.4223_ios_universal.tar.gz)  **rev. 4223**
+  * [iOS 7.0+ universal](http://bearware.dk/test/TeamTalk5SDK/v5.1.2.4358/tt5prosdk_v5.1.2.4358_ios_universal.tar.gz)  **rev. 4358**
 
 ## TeamTalk 5 Libraries
 Projects wrapping the client DLL file in the TeamTalk SDK.

diff --git a/TeamTalk.NET/TeamTalk.cs b/TeamTalk.NET/TeamTalk.cs
@@ -6043,7 +6043,7 @@ public bool SetUserStereo(int nUserID, StreamType nStreamType, bool bLeftSpeaker
          * out the section @ref spying.
          *
          * @param nUserID The ID of the #BearWare.User which should
-         * store audio to disk.
+         * store audio to disk. Pass 0 to store local instance's media stream.
          * @param szFolderPath The path on disk to where files should be stored.
          * This value will be stored in @a szMediaStorageDir of #BearWare.User.
          * @param szFileNameVars The file name used for audio files