qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From shus...@apache.org
Subject svn commit: r1510850 - /qpid/branches/0.24/qpid/packaging/windows/qpidc.wxs
Date Tue, 06 Aug 2013 02:57:58 GMT
Author: shuston
Date: Tue Aug  6 02:57:58 2013
New Revision: 1510850

URL: http://svn.apache.org/r1510850
Log:
QPID-5031 merged to 0.24

Modified:
    qpid/branches/0.24/qpid/packaging/windows/qpidc.wxs   (contents, props changed)

Modified: qpid/branches/0.24/qpid/packaging/windows/qpidc.wxs
URL: http://svn.apache.org/viewvc/qpid/branches/0.24/qpid/packaging/windows/qpidc.wxs?rev=1510850&r1=1510849&r2=1510850&view=diff
==============================================================================
--- qpid/branches/0.24/qpid/packaging/windows/qpidc.wxs (original)
+++ qpid/branches/0.24/qpid/packaging/windows/qpidc.wxs Tue Aug  6 02:57:58 2013
@@ -96,8 +96,7 @@
         <!-- This registry key, values, procedure, and reasoning are
              described at http://support.microsoft.com/kb/817066
              It's necessary for the WCF XA support to work properly. -->
-        <RegistryKey Root="HKLM" Key="SOFTWARE\Microsoft\MSDTC\XADLL"
-                     Action="create">
+        <RegistryKey Root="HKLM" Key="SOFTWARE\Microsoft\MSDTC\XADLL">
           <RegistryValue Type="string"
                          Name="qpidxarm.dll"
                          Value="[QpidBin]qpidxarm.dll" />

Propchange: qpid/branches/0.24/qpid/packaging/windows/qpidc.wxs
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Tue Aug  6 02:57:58 2013
@@ -0,0 +1,7 @@
+/qpid/branches/0.10/qpid/packaging/windows/qpidc.wxs:1103083
+/qpid/branches/0.5.x-dev/qpid/packaging/windows/qpidc.wxs:892761,894875
+/qpid/branches/0.6-release-windows-installer/packaging/windows/qpidc.wxs:926803
+/qpid/branches/0.6-release-windows-installer/qpid/packaging/windows/qpidc.wxs:926865,927233
+/qpid/branches/java-network-refactor/qpid/packaging/windows/qpidc.wxs:805429-825319
+/qpid/branches/qpid-2935/qpid/packaging/windows/qpidc.wxs:1061302-1072333
+/qpid/trunk/qpid/packaging/windows/qpidc.wxs:1509969



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org


Mime
View raw message