Fixes and cleanups, successful 2.5 build.
authorscantor <scantor@cb58f699-b61c-0410-a6fe-9272a202ed29>
Fri, 18 May 2012 21:11:21 +0000 (21:11 +0000)
committerscantor <scantor@cb58f699-b61c-0410-a6fe-9272a202ed29>
Fri, 18 May 2012 21:11:21 +0000 (21:11 +0000)
commit087330139e6953e3128c3dab55a1d1fbf7c1e0c7
treea9a90afde685e95432015c1fa1b9eb9e024bc571
parent943c149f4e03e2193690e400cf56373754645f5d
Fixes and cleanups, successful 2.5 build.

git-svn-id: https://svn.shibboleth.net/cpp-sp/branches/REL_2@3668 cb58f699-b61c-0410-a6fe-9272a202ed29
msi/WiX/MergeModules/Curl-x64.wxs
msi/WiX/MergeModules/OpenSAML-x64.wxs
msi/WiX/MergeModules/Xerces-x64.wxs
msi/WiX/MergeModules/XmlSec-x64.wxs
msi/WiX/ShibbolethSP-defs-x86.wxi
msi/WiX/ShibbolethSP-exe-x64.wxs
msi/WiX/ShibbolethSP-noarch.wxs