1 files changed, 24 insertions, 0 deletions
diff --git a/win32.bat b/win32.bat
index 744c31b3..f0cd6405 100644
--- a/win32.bat
+++ b/win32.bat
@@ -4,22 +4,40 @@ echo quick and dirty to get up and running by generating the required files
 echo using Cygwin and Perl
 
 copy .\infrastructure\BoxPlatform.pm.in .\infrastructure\BoxPlatform.pm
+<<<<<<< HEAD
+=======
+copy .\lib\common\BoxPortsAndFiles.h.in .\lib\common\BoxPortsAndFiles.h
+copy .\lib\common\BoxConfig-MSVC.h .\lib\common\BoxConfig.h
+>>>>>>> 0.12
 
 cd .\bin\bbackupquery\ & perl ./../../bin/bbackupquery/makedocumentation.pl.in
 cd ..\..\
 
+<<<<<<< HEAD
 cd .\lib\backupclient & perl ./../../lib/common/makeexception.pl.in BackupStoreException.txt & perl ./../../lib/server/makeprotocol.pl.in Client ./../../bin/bbstored/backupprotocol.txt
+=======
+cd .\lib\backupstore & perl ./../../lib/common/makeexception.pl.in BackupStoreException.txt & perl ./../../lib/server/makeprotocol.pl.in backupprotocol.txt
+>>>>>>> 0.12
 cd ..\..\
 
 cd .\lib\compress & perl ./../../lib/common/makeexception.pl.in CompressException.txt
 cd ..\..\
 
 cd .\lib\common & perl ./../../lib/common/makeexception.pl.in CommonException.txt & perl ./../../lib/common/makeexception.pl.in ConversionException.txt
+<<<<<<< HEAD
 
 cd ..\..\
 
 cd .\bin\bbackupd & perl ./../../lib/common/makeexception.pl.in ClientException.txt
 
+=======
+cd ..\..\
+
+cd .\lib\raidfile & perl ./../../lib/common/makeexception.pl.in RaidFileException.txt
+cd ..\..\
+
+cd .\bin\bbackupd & perl ./../../lib/common/makeexception.pl.in ClientException.txt
+>>>>>>> 0.12
 cd ..\..\
 
 cd .\lib\crypto & perl ./../../lib/common/makeexception.pl.in CipherException.txt
@@ -31,3 +49,9 @@ cd .\lib\server & perl ./../../lib/common/makeexception.pl.in ServerException.tx
 cd ..\..\
 
 perl -pe 's/@PERL@/perl/' ./test/bbackupd/testfiles/bbackupd.conf.in > .\test\bbackupd\testfiles\bbackupd.conf
+<<<<<<< HEAD
+=======
+
+echo Generating InstallJammer configuration file
+perl infrastructure/msvc/fake-config.sub.pl ./contrib/windows/installer/boxbackup.mpi.in > ./contrib/windows/installer/boxbackup.mpi
+>>>>>>> 0.12