Project "FreeSWITCH user-contributed scripts, etc" received a push.

committer: Mitch Capper
comments: 
Merge branch 'master' of ssh://git.freeswitch.org/freeswitch-contrib

committer: Jeff Lenk
comments: 
FSClient remove redundant setup

diff --git a/mitchcapper/FSClient/Setup/Setup.wixproj b/mitchcapper/FSClient/Setup/Setup.wixproj
index acfcb35..acc41b5 100644
--- a/mitchcapper/FSClient/Setup/Setup.wixproj
+++ b/mitchcapper/FSClient/Setup/Setup.wixproj
@@ -101,6 +101,6 @@
 	</Target>
 	-->
   <Target Name="AfterBuild">
-    <GenerateBootstrapper ApplicationFile="$(TargetFileName)" ApplicationName="FSClient Setup" BootstrapperItems="@(BootstrapperFile)" ComponentsLocation="HomeSite" CopyComponents="True" OutputPath="$(OutputPath)" Path="C:\Program Files (X86)\Microsoft SDKs\Windows\v7.0A\Bootstrapper\" />
+    <GenerateBootstrapper ApplicationFile="$(TargetFileName)" ApplicationName="FSClient" BootstrapperItems="@(BootstrapperFile)" ComponentsLocation="HomeSite" CopyComponents="True" OutputPath="$(OutputPath)" Path="C:\Program Files (X86)\Microsoft SDKs\Windows\v7.0A\Bootstrapper\" />
   </Target>
 </Project>
\ No newline at end of file

committer: Mathieu Parent
comments: 
Cisco-XML: add ms-video support for VLC

diff --git a/sathieu/cisco-xml/lib/MediaBrotha/Backend/VLC.php b/sathieu/cisco-xml/lib/MediaBrotha/Backend/VLC.php
index 03f5360..12cbff6 100644
--- a/sathieu/cisco-xml/lib/MediaBrotha/Backend/VLC.php
+++ b/sathieu/cisco-xml/lib/MediaBrotha/Backend/VLC.php
@@ -28,6 +28,7 @@ class MediaBrotha_Backend_VLC extends MediaBrotha_Backend {
 	public function register() {
 		parent::register();
 		MediaBrotha_Core::registerMimeType($this, 'audio/mpeg');
+		MediaBrotha_Core::registerMimeType($this, 'video/x-msvideo');
 	}
 
 	public function fetch($uri) {

committer: Mathieu Parent
comments: 
Cisco-XML: correct typos

diff --git a/sathieu/cisco-xml/lib/MediaBrotha/Frontend/CiscoXML.php b/sathieu/cisco-xml/lib/MediaBrotha/Frontend/CiscoXML.php
index a0a9078..ce2f711 100644
--- a/sathieu/cisco-xml/lib/MediaBrotha/Frontend/CiscoXML.php
+++ b/sathieu/cisco-xml/lib/MediaBrotha/Frontend/CiscoXML.php
@@ -52,9 +52,9 @@ class MediaBrotha_Frontend_CiscoXML extends MediaBrotha_Frontend {
 		$this->_xml->setCiscoElement('SoftKeyItem',
 			Array('Name' => 'Enqueue', 'URL' => 'QueryStringParam:action=pl_enqueue', 'Position' => '5'));
 		$this->_xml->setCiscoElement('SoftKeyItem',
-			Array('Name' => 'Enqueue', 'URL' => 'QueryStringParam:action=pl_next', 'Position' => '6'));
+			Array('Name' => 'Next', 'URL' => 'QueryStringParam:action=pl_next', 'Position' => '6'));
 		$this->_xml->setCiscoElement('SoftKeyItem',
-			Array('Name' => 'Enqueue', 'URL' => 'QueryStringParam:action=pl_previous', 'Position' => '7'));
+			Array('Name' => 'Previous', 'URL' => 'QueryStringParam:action=pl_previous', 'Position' => '7'));
 		$this->_xml->setCiscoElement('SoftKeyItem',
 			Array('Name' => 'Quit', 'URL' => 'SoftKey:Exit', 'Position' => '8'));
 	}