From 0524cc87452bfb677f6d4f22be9921b850cef0f9 Mon Sep 17 00:00:00 2001
From: Simon Rozman <simon@rozman.si>
Date: Fri, 11 Mar 2016 14:59:32 +0100
Subject: [PATCH 1/4] Common property sheet removed as included in Win32 and
 x64 property sheets

---
 build/MSICALib.vcxproj | 2 --
 1 file changed, 2 deletions(-)

diff --git a/build/MSICALib.vcxproj b/build/MSICALib.vcxproj
index cb26776..0872ced 100644
--- a/build/MSICALib.vcxproj
+++ b/build/MSICALib.vcxproj
@@ -50,7 +50,6 @@
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\include\common.props" />
     <Import Project="..\..\..\include\Win32.props" />
     <Import Project="..\..\..\include\Release.props" />
     <Import Project="MSICALib.props" />
@@ -63,7 +62,6 @@
   </ImportGroup>
   <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
-    <Import Project="..\..\..\include\common.props" />
     <Import Project="..\..\..\include\x64.props" />
     <Import Project="..\..\..\include\Release.props" />
     <Import Project="MSICALib.props" />

From cc11ee442d86acd60df6fece552c86f4eca4d878 Mon Sep 17 00:00:00 2001
From: Simon Rozman <simon@rozman.si>
Date: Fri, 11 Mar 2016 14:59:52 +0100
Subject: [PATCH 2/4] Path fixed

---
 MSIBuild/Makefile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/MSIBuild/Makefile b/MSIBuild/Makefile
index 8095cbf..7448347 100644
--- a/MSIBuild/Makefile
+++ b/MSIBuild/Makefile
@@ -17,7 +17,7 @@
 #    along with MSICA. If not, see <http://www.gnu.org/licenses/>.
 #
 
-!INCLUDE "..\..\..\MSI\include\MSIBuildCfg.mak"
+!INCLUDE "..\..\..\..\include\MSIBuildCfg.mak"
 
 MSIBUILD_IS_LOCALIZEABLE=1
 
@@ -29,7 +29,7 @@ All :: \
 	"$(LANG).$(PLAT).$(CFG).Error-1.idt" \
 	"$(LANG).$(PLAT).$(CFG).Error-2.idt"
 
-"$(LANG).$(PLAT).$(CFG).Error-1.idt" : "Makefile" "..\..\..\MSI\include\MSIBuildCfg.mak"
+"$(LANG).$(PLAT).$(CFG).Error-1.idt" : "Makefile" "..\..\..\..\include\MSIBuildCfg.mak"
 	-if exist $@ del /f /q $@
 	move /y << $@ > NUL
 Error	Message
@@ -37,7 +37,7 @@ i2	L0
 Error	Error
 <<NOKEEP
 
-"En.$(PLAT).$(CFG).Error-2.idtx" : "Makefile" "..\..\..\MSI\include\MSIBuildCfg.mak"
+"En.$(PLAT).$(CFG).Error-2.idtx" : "Makefile" "..\..\..\..\include\MSIBuildCfg.mak"
 	-if exist $@ del /f /q $@
 	move /y << $@ > NUL
 Error	Message
@@ -85,4 +85,4 @@ i2	L0
 # Build MSM module!
 ######################################################################
 
-!INCLUDE "..\..\..\MSI\MSIBuild\MSM.mak"
+!INCLUDE "..\..\..\..\MSIBuild\MSM.mak"

From 6ac1f04b14c7cb78881c4c73db23e8cf9be86b9a Mon Sep 17 00:00:00 2001
From: Simon Rozman <simon@rozman.si>
Date: Sat, 12 Mar 2016 07:14:35 +0100
Subject: [PATCH 3/4] GIT/SVN attributes added

---
 .gitattributes | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 .gitattributes

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..8b09834
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,17 @@
+* text=auto !eol
+L10N/sl_SI.po -text
+MSIBuild/Makefile -text
+MSIBuild/build_all.bat -text
+MSIBuild/clean_all.bat -text
+MSICALib.cpp -text
+MSICALib.h -text
+MSICALib.vcxproj -text svneol=unset#text/xml
+MSICALib.vcxproj.filters -text svneol=unset#text/xml
+OpCert.cpp -text
+OpFile.cpp -text
+OpReg.cpp -text
+OpSvc.cpp -text
+OpTS.cpp -text
+OpWLAN.cpp -text
+stdafx.cpp -text
+stdafx.h -text

From 35cf9a876775d723461d5bc78e5c6e65474ebb44 Mon Sep 17 00:00:00 2001
From: Simon Rozman <simon@rozman.si>
Date: Sat, 12 Mar 2016 07:54:11 +0100
Subject: [PATCH 4/4] Project reorganization

---
 MSIBuild/Makefile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/MSIBuild/Makefile b/MSIBuild/Makefile
index 7448347..8095cbf 100644
--- a/MSIBuild/Makefile
+++ b/MSIBuild/Makefile
@@ -17,7 +17,7 @@
 #    along with MSICA. If not, see <http://www.gnu.org/licenses/>.
 #
 
-!INCLUDE "..\..\..\..\include\MSIBuildCfg.mak"
+!INCLUDE "..\..\..\MSI\include\MSIBuildCfg.mak"
 
 MSIBUILD_IS_LOCALIZEABLE=1
 
@@ -29,7 +29,7 @@ All :: \
 	"$(LANG).$(PLAT).$(CFG).Error-1.idt" \
 	"$(LANG).$(PLAT).$(CFG).Error-2.idt"
 
-"$(LANG).$(PLAT).$(CFG).Error-1.idt" : "Makefile" "..\..\..\..\include\MSIBuildCfg.mak"
+"$(LANG).$(PLAT).$(CFG).Error-1.idt" : "Makefile" "..\..\..\MSI\include\MSIBuildCfg.mak"
 	-if exist $@ del /f /q $@
 	move /y << $@ > NUL
 Error	Message
@@ -37,7 +37,7 @@ i2	L0
 Error	Error
 <<NOKEEP
 
-"En.$(PLAT).$(CFG).Error-2.idtx" : "Makefile" "..\..\..\..\include\MSIBuildCfg.mak"
+"En.$(PLAT).$(CFG).Error-2.idtx" : "Makefile" "..\..\..\MSI\include\MSIBuildCfg.mak"
 	-if exist $@ del /f /q $@
 	move /y << $@ > NUL
 Error	Message
@@ -85,4 +85,4 @@ i2	L0
 # Build MSM module!
 ######################################################################
 
-!INCLUDE "..\..\..\..\MSIBuild\MSM.mak"
+!INCLUDE "..\..\..\MSI\MSIBuild\MSM.mak"