<h1>Project "FreeSWITCH user-contributed scripts, etc" received a push.</h1>

<h2>branch: master updated</h2>
<pre>
       via: 9d2159f50948fd24df3a8bd2cfca6b134fb06643 (commit)
       via: 24d4ad4efc9304067e70ef087ff723b9d996c49c (commit)
       via: f242d90a8febb1151c3e52998e3af08780345026 (commit)
       via: 6ca02e4ccb7d608a626e21141c8addd140b71a8e (commit)
      from: 215d28aad12526e59f86e03e62b4a44def0bb0c9 (commit)


</pre>= COMMIT LOG ===========================================================
<div class="highlight"><pre>committer: Mitch Capper
comments: 
Merge branch &#39;master&#39; of ssh://git.freeswitch.org/freeswitch-contrib
</pre></div>
<div class="highlight"><pre>committer: Jeff Lenk
comments: 
FSClient remove redundant setup

<span style="color: #000080; font-weight: bold">diff --git a/mitchcapper/FSClient/Setup/Setup.wixproj b/mitchcapper/FSClient/Setup/Setup.wixproj</span>
<span style="color: #000080; font-weight: bold">index acfcb35..acc41b5 100644</span>
<span style="color: #A00000">--- a/mitchcapper/FSClient/Setup/Setup.wixproj</span>
<span style="color: #00A000">+++ b/mitchcapper/FSClient/Setup/Setup.wixproj</span>
<span style="color: #800080; font-weight: bold">@@ -101,6 +101,6 @@</span>
         &lt;/Target&gt;
         --&gt;
   &lt;Target Name=&quot;AfterBuild&quot;&gt;
<span style="color: #A00000">-    &lt;GenerateBootstrapper ApplicationFile=&quot;$(TargetFileName)&quot; ApplicationName=&quot;FSClient Setup&quot; BootstrapperItems=&quot;@(BootstrapperFile)&quot; ComponentsLocation=&quot;HomeSite&quot; CopyComponents=&quot;True&quot; OutputPath=&quot;$(OutputPath)&quot; Path=&quot;C:\Program Files (X86)\Microsoft SDKs\Windows\v7.0A\Bootstrapper\&quot; /&gt;</span>
<span style="color: #00A000">+    &lt;GenerateBootstrapper ApplicationFile=&quot;$(TargetFileName)&quot; ApplicationName=&quot;FSClient&quot; BootstrapperItems=&quot;@(BootstrapperFile)&quot; ComponentsLocation=&quot;HomeSite&quot; CopyComponents=&quot;True&quot; OutputPath=&quot;$(OutputPath)&quot; Path=&quot;C:\Program Files (X86)\Microsoft SDKs\Windows\v7.0A\Bootstrapper\&quot; /&gt;</span>
   &lt;/Target&gt;
 &lt;/Project&gt;
\ No newline at end of file
</pre></div>
<div class="highlight"><pre>committer: Mathieu Parent
comments: 
Cisco-XML: add ms-video support for VLC

<span style="color: #000080; font-weight: bold">diff --git a/sathieu/cisco-xml/lib/MediaBrotha/Backend/VLC.php b/sathieu/cisco-xml/lib/MediaBrotha/Backend/VLC.php</span>
<span style="color: #000080; font-weight: bold">index 03f5360..12cbff6 100644</span>
<span style="color: #A00000">--- a/sathieu/cisco-xml/lib/MediaBrotha/Backend/VLC.php</span>
<span style="color: #00A000">+++ b/sathieu/cisco-xml/lib/MediaBrotha/Backend/VLC.php</span>
<span style="color: #800080; font-weight: bold">@@ -28,6 +28,7 @@ class MediaBrotha_Backend_VLC extends MediaBrotha_Backend {</span>
         public function register() {
                 parent::register();
                 MediaBrotha_Core::registerMimeType($this, &#39;audio/mpeg&#39;);
<span style="color: #00A000">+                MediaBrotha_Core::registerMimeType($this, &#39;video/x-msvideo&#39;);</span>
         }
 
         public function fetch($uri) {
</pre></div>
<div class="highlight"><pre>committer: Mathieu Parent
comments: 
Cisco-XML: correct typos

<span style="color: #000080; font-weight: bold">diff --git a/sathieu/cisco-xml/lib/MediaBrotha/Frontend/CiscoXML.php b/sathieu/cisco-xml/lib/MediaBrotha/Frontend/CiscoXML.php</span>
<span style="color: #000080; font-weight: bold">index a0a9078..ce2f711 100644</span>
<span style="color: #A00000">--- a/sathieu/cisco-xml/lib/MediaBrotha/Frontend/CiscoXML.php</span>
<span style="color: #00A000">+++ b/sathieu/cisco-xml/lib/MediaBrotha/Frontend/CiscoXML.php</span>
<span style="color: #800080; font-weight: bold">@@ -52,9 +52,9 @@ class MediaBrotha_Frontend_CiscoXML extends MediaBrotha_Frontend {</span>
                 $this-&gt;_xml-&gt;setCiscoElement(&#39;SoftKeyItem&#39;,
                         Array(&#39;Name&#39; =&gt; &#39;Enqueue&#39;, &#39;URL&#39; =&gt; &#39;QueryStringParam:action=pl_enqueue&#39;, &#39;Position&#39; =&gt; &#39;5&#39;));
                 $this-&gt;_xml-&gt;setCiscoElement(&#39;SoftKeyItem&#39;,
<span style="color: #A00000">-                        Array(&#39;Name&#39; =&gt; &#39;Enqueue&#39;, &#39;URL&#39; =&gt; &#39;QueryStringParam:action=pl_next&#39;, &#39;Position&#39; =&gt; &#39;6&#39;));</span>
<span style="color: #00A000">+                        Array(&#39;Name&#39; =&gt; &#39;Next&#39;, &#39;URL&#39; =&gt; &#39;QueryStringParam:action=pl_next&#39;, &#39;Position&#39; =&gt; &#39;6&#39;));</span>
                 $this-&gt;_xml-&gt;setCiscoElement(&#39;SoftKeyItem&#39;,
<span style="color: #A00000">-                        Array(&#39;Name&#39; =&gt; &#39;Enqueue&#39;, &#39;URL&#39; =&gt; &#39;QueryStringParam:action=pl_previous&#39;, &#39;Position&#39; =&gt; &#39;7&#39;));</span>
<span style="color: #00A000">+                        Array(&#39;Name&#39; =&gt; &#39;Previous&#39;, &#39;URL&#39; =&gt; &#39;QueryStringParam:action=pl_previous&#39;, &#39;Position&#39; =&gt; &#39;7&#39;));</span>
                 $this-&gt;_xml-&gt;setCiscoElement(&#39;SoftKeyItem&#39;,
                         Array(&#39;Name&#39; =&gt; &#39;Quit&#39;, &#39;URL&#39; =&gt; &#39;SoftKey:Exit&#39;, &#39;Position&#39; =&gt; &#39;8&#39;));
         }
</pre></div>
========================================================================<pre>

Summary of changes:
 mitchcapper/FSClient/Setup/Setup.wixproj           |    2 +-
 sathieu/cisco-xml/lib/MediaBrotha/Backend/VLC.php  |    1 +
 .../lib/MediaBrotha/Frontend/CiscoXML.php          |    4 ++--
 3 files changed, 4 insertions(+), 3 deletions(-)
</pre>
<p>this email was generated because of /git/your-repo.git/hooks/post-receive by the file /git-core/contrib/hooks/post-receive-email<br />
For more info, see <a href="http://blog.chomperstomp.com/?p=630">http://blog.chomperstomp.com/?p=630</a>
-- <br />
FreeSWITCH user-contributed scripts, etc</p>