From 881ece062087a74260dde61846530cd05df71295 Mon Sep 17 00:00:00 2001
From: scantor <scantor@cb58f699-b61c-0410-a6fe-9272a202ed29>
Date: Mon, 29 Oct 2012 17:56:24 +0000
Subject: [PATCH] Ignore addtl Wix files

git-svn-id: https://svn.shibboleth.net/cpp-sp/branches/REL_2@3808 cb58f699-b61c-0410-a6fe-9272a202ed29
---
 .gitignore | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index e3b5dfe..8e9aebd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -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
-- 
2.1.4