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

branch: master updated

       via: 0bff16bee499925e83339750a0ce5c1386fc0048 (commit)
       via: 98ea43c3681dd0263dcf027aef3437732e0682e1 (commit)
       via: 9aa2f07c369938230c5c4b8b61b67b1c53749efe (commit)
       via: cfaca250a7c49387abd98ef3fbd7124efb02d422 (commit)
       via: b6c998685330b7c689cd08726438271ac68f0361 (commit)
       via: 75bbd885eb1eef0bcfea9b5371557823ca584522 (commit)
      from: 9858ca1c2a2fda5d56f268a6e359e207eedde6ab (commit)
= COMMIT LOG =========================================================== 
committer: Mitch Capper
comments: 
Merge branch 'master' of ssh://git.freeswitch.org/freeswitch-contrib

committer: Raymond Chandler
comments: 
multiple congratulates

diff --git a/intralanman/PHP/fs_curl/README b/intralanman/PHP/fs_curl/README
index ec4930b..bc8d301 100644
--- a/intralanman/PHP/fs_curl/README
+++ b/intralanman/PHP/fs_curl/README
@@ -181,7 +181,7 @@ you see this results
 
 
 
-CONGRADULATION... XML_CURL with intralan contrib working
+CONGRADULATIONS... XML_CURL with intralan contrib working
 
 now its your own, how you like to do next
 

committer: Raymond Chandler
comments: 
Merge branch 'master' of git.freeswitch.org:freeswitch-contrib

committer: Raymond Chandler
comments: 
testing

diff --git a/intralanman/PHP/fs_curl/README b/intralanman/PHP/fs_curl/README
index 0fe8567..ec4930b 100644
--- a/intralanman/PHP/fs_curl/README
+++ b/intralanman/PHP/fs_curl/README
@@ -197,4 +197,4 @@ try calling
 5000 - demo IVR (requires sounds and music files to be installed) 
 9995 - five second delay echo test 
 9996 - standard echo test 
-9999 - music on hold (requires music files to be installed) 
\ No newline at end of file
+9999 - music on hold (requires music files to be installed) 

committer: Jeff Lenk
comments: 
add quotes on path

diff --git a/mitchcapper/FSClient/FSClient.csproj b/mitchcapper/FSClient/FSClient.csproj
index b12ef37..3e6aaa1 100644
--- a/mitchcapper/FSClient/FSClient.csproj
+++ b/mitchcapper/FSClient/FSClient.csproj
@@ -252,7 +252,7 @@ if not exist ".\conf" md conf
 copy ..\..\"external items"\conf\freeswitch.xml .\conf</PostBuildEvent>
   </PropertyGroup>
   <PropertyGroup>
-    <PreBuildEvent>if exist "%25FREESWITCH_SRC_LOCATION%25" copy  %25FREESWITCH_SRC_LOCATION%25\Win32\$(ConfigurationName)\mod\FreeSWITCH.Managed.dll ..\..\"external items"</PreBuildEvent>
+    <PreBuildEvent>if exist "%25FREESWITCH_SRC_LOCATION%25" copy  "%25FREESWITCH_SRC_LOCATION%25"\Win32\$(ConfigurationName)\mod\FreeSWITCH.Managed.dll ..\..\"external items"</PreBuildEvent>
   </PropertyGroup>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

committer: Jeff Lenk
comments: 
try to fix the localization install fail again

diff --git a/mitchcapper/FSClient/Setup/FSCore.wxs b/mitchcapper/FSClient/Setup/FSCore.wxs
index b59f5f8..2e95778 100644
--- a/mitchcapper/FSClient/Setup/FSCore.wxs
+++ b/mitchcapper/FSClient/Setup/FSCore.wxs
@@ -18,7 +18,7 @@
           <Component Id="cmp3900B358BC2FB69DF2C42DDE35C5BBB2" Guid="*">
             <File Id="fil322A57E96A97A8179B75065ABF94F809" KeyPath="yes" Source="$(var.FSClient.TargetDir)\FreeSwitch.dll" />
             <CreateFolder Directory="INSTALLLOCATION">
-              <Permission User="Users" GenericAll="yes" />
+              <PermissionEx User="Users" GenericRead="yes" GenericWrite="yes" CreateFile="yes" xmlns="http://schemas.microsoft.com/wix/UtilExtension"/>
             </CreateFolder>
           </Component>
           <Component Id="cmp3CD83BDDE0C679AC83F36ABCCC44B85F" Guid="*">
diff --git a/mitchcapper/FSClient/Setup/Setup.wixproj b/mitchcapper/FSClient/Setup/Setup.wixproj
index 62c873c..7fea603 100644
--- a/mitchcapper/FSClient/Setup/Setup.wixproj
+++ b/mitchcapper/FSClient/Setup/Setup.wixproj
@@ -72,6 +72,10 @@
     </BootstrapperFile>
   </ItemGroup>
   <ItemGroup>
+    <WixExtension Include="WixUtilExtension">
+      <HintPath>$(WixExtDir)\WixUtilExtension.dll</HintPath>
+      <Name>WixUtilExtension</Name>
+    </WixExtension>
     <WixExtension Include="WixNetFxExtension">
       <HintPath>$(WixExtDir)\WixNetFxExtension.dll</HintPath>
       <Name>WixNetFxExtension</Name>
========================================================================

Summary of changes:
 intralanman/PHP/fs_curl/README           |    4 ++--
 mitchcapper/FSClient/FSClient.csproj     |    2 +-
 mitchcapper/FSClient/Setup/FSCore.wxs    |    2 +-
 mitchcapper/FSClient/Setup/Setup.wixproj |    4 ++++
 4 files changed, 8 insertions(+), 4 deletions(-)

this email was generated because of /git/your-repo.git/hooks/post-receive by the file /git-core/contrib/hooks/post-receive-email
For more info, see http://blog.chomperstomp.com/?p=630 --
FreeSWITCH user-contributed scripts, etc