[cpp-sp COMMIT] /branches/REL_2/.gitignore

[noreply at shibboleth.net]

Author: scantor
Date: Mon Oct 29 13:56:24 2012
New Revision: 3808

URL: http://svn.shibboleth.net/view/cpp-sp?rev=3808&view=rev
Log:
Ignore addtl Wix files

Modified:
    branches/REL_2/.gitignore

Modified: branches/REL_2/.gitignore
URL: http://svn.shibboleth.net/view/cpp-sp/branches/REL_2/.gitignore?rev=3808&r1=3807&r2=3808&view=diff
==============================================================================
--- branches/REL_2/.gitignore (original)
+++ branches/REL_2/.gitignore Mon Oct 29 13:56:24 2012
@@ -132,11 +132,11 @@
 /msi/compile.log
 
 # /msi/WiX
-/msi/WiX/*.wixobj
-/msi/WiX/*.wixpdb
+/msi/WiX/*.wix*
 /msi/WiX/*.msi
 /msi/WiX/Debug
 /msi/WiX/Release
+/msi/WiX/x64
 
 # /msi/WiX/MergeModules
 /msi/WiX/MergeModules/*.wixobj
@@ -145,6 +145,8 @@
 /msi/WiX/MergeModules/*.msi
 /msi/WiX/MergeModules/Debug
 /msi/WiX/MergeModules/Release
+/msi/WiX/MergeModules/x64
+/msi/WiX/MergeModules/*.user
 
 # /nsapi_shib/
 /nsapi_shib/*.plg