[Decaldev-cvscommit] source/DecalInstaller DecalInstaller.vdproj,1.1,1.2

[<ma...@us...>]

Update of /cvsroot/decaldev/source/DecalInstaller
In directory sc8-pr-cvs1:/tmp/cvs-serv5635

Modified Files:
	DecalInstaller.vdproj 
Log Message:
use ATL mergemodule

Index: DecalInstaller.vdproj
===================================================================
RCS file: /cvsroot/decaldev/source/DecalInstaller/DecalInstaller.vdproj,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** DecalInstaller.vdproj	13 May 2003 07:16:10 -0000	1.1
--- DecalInstaller.vdproj	14 May 2003 01:50:02 -0000	1.2
***************
*** 29,33 ****
          {
          "MsmKey" = "8:_10D01E415273DFB80A6309EC12D187D8"
!         "OwnerKey" = "8:_A03B9AE58553491581FA0975DF6E6E88"
          "MsmSig" = "8:_UNDEFINED"
          }
--- 29,33 ----
          {
          "MsmKey" = "8:_10D01E415273DFB80A6309EC12D187D8"
!         "OwnerKey" = "8:_0593B7A6B4D74017A43CC5F9741D078B"
          "MsmSig" = "8:_UNDEFINED"
          }
***************
*** 53,56 ****
--- 53,62 ----
          {
          "MsmKey" = "8:_10D01E415273DFB80A6309EC12D187D8"
+         "OwnerKey" = "8:_A03B9AE58553491581FA0975DF6E6E88"
+         "MsmSig" = "8:_UNDEFINED"
+         }
+         "Entry"
+         {
+         "MsmKey" = "8:_10D01E415273DFB80A6309EC12D187D8"
          "OwnerKey" = "8:_8E9B4D574D014738B94369502A191459"
          "MsmSig" = "8:_UNDEFINED"
***************
*** 76,92 ****
          "Entry"
          {
!         "MsmKey" = "8:_10D01E415273DFB80A6309EC12D187D8"
!         "OwnerKey" = "8:_0593B7A6B4D74017A43CC5F9741D078B"
          "MsmSig" = "8:_UNDEFINED"
          }
          "Entry"
          {
!         "MsmKey" = "8:_11AE7CD5CB2A43E395B33FDD50522940"
!         "OwnerKey" = "8:_UNDEFINED"
          "MsmSig" = "8:_UNDEFINED"
          }
          "Entry"
          {
!         "MsmKey" = "8:_23FC18A2DEBB4DF98431626348FE3CE7"
          "OwnerKey" = "8:_0593B7A6B4D74017A43CC5F9741D078B"
          "MsmSig" = "8:_UNDEFINED"
--- 82,110 ----
          "Entry"
          {
!         "MsmKey" = "8:_11AE7CD5CB2A43E395B33FDD50522940"
!         "OwnerKey" = "8:_UNDEFINED"
          "MsmSig" = "8:_UNDEFINED"
          }
          "Entry"
          {
!         "MsmKey" = "8:_154DE3989F9C45AFAF5E1E1FB0757E1D"
!         "OwnerKey" = "8:_10B736524B444A95B8CC8D36B521F980"
          "MsmSig" = "8:_UNDEFINED"
          }
          "Entry"
          {
!         "MsmKey" = "8:_154DE3989F9C45AFAF5E1E1FB0757E1D"
!         "OwnerKey" = "8:_A03B9AE58553491581FA0975DF6E6E88"
!         "MsmSig" = "8:_UNDEFINED"
!         }
!         "Entry"
!         {
!         "MsmKey" = "8:_154DE3989F9C45AFAF5E1E1FB0757E1D"
!         "OwnerKey" = "8:_11AE7CD5CB2A43E395B33FDD50522940"
!         "MsmSig" = "8:_UNDEFINED"
!         }
!         "Entry"
!         {
!         "MsmKey" = "8:_24505FDB0A3941A5BC465EB28A815DF0"
          "OwnerKey" = "8:_0593B7A6B4D74017A43CC5F9741D078B"
          "MsmSig" = "8:_UNDEFINED"
***************
*** 94,98 ****
          "Entry"
          {
!         "MsmKey" = "8:_23FC18A2DEBB4DF98431626348FE3CE7"
          "OwnerKey" = "8:_F7B461AAFB7641F699DAEAF49904A662"
          "MsmSig" = "8:_UNDEFINED"
--- 112,116 ----
          "Entry"
          {
!         "MsmKey" = "8:_24505FDB0A3941A5BC465EB28A815DF0"
          "OwnerKey" = "8:_F7B461AAFB7641F699DAEAF49904A662"
          "MsmSig" = "8:_UNDEFINED"
***************
*** 100,104 ****
          "Entry"
          {
!         "MsmKey" = "8:_23FC18A2DEBB4DF98431626348FE3CE7"
          "OwnerKey" = "8:_BD4EC7DFE26A40BA84001249533EC862"
          "MsmSig" = "8:_UNDEFINED"
--- 118,122 ----
          "Entry"
          {
!         "MsmKey" = "8:_24505FDB0A3941A5BC465EB28A815DF0"
          "OwnerKey" = "8:_BD4EC7DFE26A40BA84001249533EC862"
          "MsmSig" = "8:_UNDEFINED"
***************
*** 106,110 ****
          "Entry"
          {
!         "MsmKey" = "8:_23FC18A2DEBB4DF98431626348FE3CE7"
          "OwnerKey" = "8:_AC7940677AFA439D9D75C9827A0003A2"
          "MsmSig" = "8:_UNDEFINED"
--- 124,128 ----
          "Entry"
          {
!         "MsmKey" = "8:_24505FDB0A3941A5BC465EB28A815DF0"
          "OwnerKey" = "8:_AC7940677AFA439D9D75C9827A0003A2"
          "MsmSig" = "8:_UNDEFINED"
***************
*** 112,116 ****
          "Entry"
          {
!         "MsmKey" = "8:_23FC18A2DEBB4DF98431626348FE3CE7"
          "OwnerKey" = "8:_A03B9AE58553491581FA0975DF6E6E88"
          "MsmSig" = "8:_UNDEFINED"
--- 130,134 ----
          "Entry"
          {
!         "MsmKey" = "8:_24505FDB0A3941A5BC465EB28A815DF0"
          "OwnerKey" = "8:_A03B9AE58553491581FA0975DF6E6E88"
          "MsmSig" = "8:_UNDEFINED"
***************
*** 118,122 ****
          "Entry"
          {
!         "MsmKey" = "8:_23FC18A2DEBB4DF98431626348FE3CE7"
          "OwnerKey" = "8:_8E9B4D574D014738B94369502A191459"
          "MsmSig" = "8:_UNDEFINED"
--- 136,140 ----
          "Entry"
          {
!         "MsmKey" = "8:_24505FDB0A3941A5BC465EB28A815DF0"
          "OwnerKey" = "8:_8E9B4D574D014738B94369502A191459"
          "MsmSig" = "8:_UNDEFINED"
***************
*** 124,128 ****
          "Entry"
          {
!         "MsmKey" = "8:_23FC18A2DEBB4DF98431626348FE3CE7"
          "OwnerKey" = "8:_287894F290604710B0E99CD646021261"
          "MsmSig" = "8:_UNDEFINED"
--- 142,146 ----
          "Entry"
          {
!         "MsmKey" = "8:_24505FDB0A3941A5BC465EB28A815DF0"
          "OwnerKey" = "8:_287894F290604710B0E99CD646021261"
          "MsmSig" = "8:_UNDEFINED"
***************
*** 130,134 ****
          "Entry"
          {
!         "MsmKey" = "8:_23FC18A2DEBB4DF98431626348FE3CE7"
          "OwnerKey" = "8:_11AE7CD5CB2A43E395B33FDD50522940"
          "MsmSig" = "8:_UNDEFINED"
--- 148,152 ----
          "Entry"
          {
!         "MsmKey" = "8:_24505FDB0A3941A5BC465EB28A815DF0"
          "OwnerKey" = "8:_11AE7CD5CB2A43E395B33FDD50522940"
          "MsmSig" = "8:_UNDEFINED"
***************
*** 136,140 ****
          "Entry"
          {
!         "MsmKey" = "8:_23FC18A2DEBB4DF98431626348FE3CE7"
          "OwnerKey" = "8:_10B736524B444A95B8CC8D36B521F980"
          "MsmSig" = "8:_UNDEFINED"
--- 154,158 ----
          "Entry"
          {
!         "MsmKey" = "8:_24505FDB0A3941A5BC465EB28A815DF0"
          "OwnerKey" = "8:_10B736524B444A95B8CC8D36B521F980"
          "MsmSig" = "8:_UNDEFINED"
***************
*** 154,188 ****
          "Entry"
          {
!         "MsmKey" = "8:_2D197DBB587641E9BE042B361E9628D1"
!         "OwnerKey" = "8:_F7B461AAFB7641F699DAEAF49904A662"
          "MsmSig" = "8:_UNDEFINED"
          }
          "Entry"
          {
!         "MsmKey" = "8:_2D197DBB587641E9BE042B361E9628D1"
!         "OwnerKey" = "8:_BD4EC7DFE26A40BA84001249533EC862"
          "MsmSig" = "8:_UNDEFINED"
          }
          "Entry"
          {
!         "MsmKey" = "8:_2D197DBB587641E9BE042B361E9628D1"
!         "OwnerKey" = "8:_AC7940677AFA439D9D75C9827A0003A2"
          "MsmSig" = "8:_UNDEFINED"
          }
          "Entry"
          {
!         "MsmKey" = "8:_2D197DBB587641E9BE042B361E9628D1"
!         "OwnerKey" = "8:_A03B9AE58553491581FA0975DF6E6E88"
          "MsmSig" = "8:_UNDEFINED"
          }
          "Entry"
          {
!         "MsmKey" = "8:_2D197DBB587641E9BE042B361E9628D1"
!         "OwnerKey" = "8:_8E9B4D574D014738B94369502A191459"
          "MsmSig" = "8:_UNDEFINED"
          }
          "Entry"
          {
!         "MsmKey" = "8:_2D197DBB587641E9BE042B361E9628D1"
          "OwnerKey" = "8:_287894F290604710B0E99CD646021261"
          "MsmSig" = "8:_UNDEFINED"
--- 172,206 ----
          "Entry"
          {
!         "MsmKey" = "8:_32BF28F4CB1A439897137C9F6624FCE3"
!         "OwnerKey" = "8:_UNDEFINED"
          "MsmSig" = "8:_UNDEFINED"
          }
          "Entry"
          {
!         "MsmKey" = "8:_3848A0AD84FF4D7AA048E21F6BD3EB88"
!         "OwnerKey" = "8:_UNDEFINED"
          "MsmSig" = "8:_UNDEFINED"
          }
          "Entry"
          {
!         "MsmKey" = "8:_413320C13C484EB5811353BECDEB123E"
!         "OwnerKey" = "8:_287894F290604710B0E99CD646021261"
          "MsmSig" = "8:_UNDEFINED"
          }
          "Entry"
          {
!         "MsmKey" = "8:_41F2E99B0C1B72CFD51382D5E140A7E8"
!         "OwnerKey" = "8:_10B736524B444A95B8CC8D36B521F980"
          "MsmSig" = "8:_UNDEFINED"
          }
          "Entry"
          {
!         "MsmKey" = "8:_41F2E99B0C1B72CFD51382D5E140A7E8"
!         "OwnerKey" = "8:_A03B9AE58553491581FA0975DF6E6E88"
          "MsmSig" = "8:_UNDEFINED"
          }
          "Entry"
          {
!         "MsmKey" = "8:_41F2E99B0C1B72CFD51382D5E140A7E8"
          "OwnerKey" = "8:_287894F290604710B0E99CD646021261"
          "MsmSig" = "8:_UNDEFINED"
***************
*** 190,206 ****
          "Entry"
          {
!         "MsmKey" = "8:_2D197DBB587641E9BE042B361E9628D1"
!         "OwnerKey" = "8:_11AE7CD5CB2A43E395B33FDD50522940"
          "MsmSig" = "8:_UNDEFINED"
          }
          "Entry"
          {
!         "MsmKey" = "8:_2D197DBB587641E9BE042B361E9628D1"
!         "OwnerKey" = "8:_10B736524B444A95B8CC8D36B521F980"
          "MsmSig" = "8:_UNDEFINED"
          }
          "Entry"
          {
!         "MsmKey" = "8:_2D197DBB587641E9BE042B361E9628D1"
          "OwnerKey" = "8:_0593B7A6B4D74017A43CC5F9741D078B"
          "MsmSig" = "8:_UNDEFINED"
--- 208,230 ----
          "Entry"
          {
!         "MsmKey" = "8:_422DA789643D4CFC8308DBB6EB58ED8B"
!         "OwnerKey" = "8:_UNDEFINED"
          "MsmSig" = "8:_UNDEFINED"
          }
          "Entry"
          {
!         "MsmKey" = "8:_446E0F428C924CBF9A8ABBA2BED6ACD8"
!         "OwnerKey" = "8:_UNDEFINED"
          "MsmSig" = "8:_UNDEFINED"
          }
          "Entry"
          {
!         "MsmKey" = "8:_4785F00ADF0F4D128D62CF6F0E79ACF1"
!         "OwnerKey" = "8:_UNDEFINED"
!         "MsmSig" = "8:_UNDEFINED"
!         }
!         "Entry"
!         {
!         "MsmKey" = "8:_5336DC78D0FD4EBF93961224833C9322"
          "OwnerKey" = "8:_0593B7A6B4D74017A43CC5F9741D078B"
          "MsmSig" = "8:_UNDEFINED"
***************
*** 208,255 ****
          "Entry"
          {
!         "MsmKey" = "8:_32BF28F4CB1A439897137C9F6624FCE3"
!         "OwnerKey" = "8:_UNDEFINED"
          "MsmSig" = "8:_UNDEFINED"
          }
          "Entry"
          {
!         "MsmKey" = "8:_3848A0AD84FF4D7AA048E21F6BD3EB88"
!         "OwnerKey" = "8:_UNDEFINED"
          "MsmSig" = "8:_UNDEFINED"
          }
          "Entry"
          {
!         "MsmKey" = "8:_41F2E99B0C1B72CFD51382D5E140A7E8"
!         "OwnerKey" = "8:_A03B9AE58553491581FA0975DF6E6E88"
          "MsmSig" = "8:_UNDEFINED"
          }
          "Entry"
          {
!         "MsmKey" = "8:_41F2E99B0C1B72CFD51382D5E140A7E8"
!         "OwnerKey" = "8:_287894F290604710B0E99CD646021261"
          "MsmSig" = "8:_UNDEFINED"
          }
          "Entry"
          {
!         "MsmKey" = "8:_41F2E99B0C1B72CFD51382D5E140A7E8"
!         "OwnerKey" = "8:_10B736524B444A95B8CC8D36B521F980"
          "MsmSig" = "8:_UNDEFINED"
          }
          "Entry"
          {
!         "MsmKey" = "8:_422DA789643D4CFC8308DBB6EB58ED8B"
!         "OwnerKey" = "8:_UNDEFINED"
          "MsmSig" = "8:_UNDEFINED"
          }
          "Entry"
          {
!         "MsmKey" = "8:_446E0F428C924CBF9A8ABBA2BED6ACD8"
!         "OwnerKey" = "8:_UNDEFINED"
          "MsmSig" = "8:_UNDEFINED"
          }
          "Entry"
          {
!         "MsmKey" = "8:_4785F00ADF0F4D128D62CF6F0E79ACF1"
!         "OwnerKey" = "8:_UNDEFINED"
          "MsmSig" = "8:_UNDEFINED"
          }
--- 232,279 ----
          "Entry"
          {
!         "MsmKey" = "8:_5336DC78D0FD4EBF93961224833C9322"
!         "OwnerKey" = "8:_F7B461AAFB7641F699DAEAF49904A662"
          "MsmSig" = "8:_UNDEFINED"
          }
          "Entry"
          {
!         "MsmKey" = "8:_5336DC78D0FD4EBF93961224833C9322"
!         "OwnerKey" = "8:_BD4EC7DFE26A40BA84001249533EC862"
          "MsmSig" = "8:_UNDEFINED"
          }
          "Entry"
          {
!         "MsmKey" = "8:_5336DC78D0FD4EBF93961224833C9322"
!         "OwnerKey" = "8:_AC7940677AFA439D9D75C9827A0003A2"
          "MsmSig" = "8:_UNDEFINED"
          }
          "Entry"
          {
!         "MsmKey" = "8:_5336DC78D0FD4EBF93961224833C9322"
!         "OwnerKey" = "8:_A03B9AE58553491581FA0975DF6E6E88"
          "MsmSig" = "8:_UNDEFINED"
          }
          "Entry"
          {
!         "MsmKey" = "8:_5336DC78D0FD4EBF93961224833C9322"
!         "OwnerKey" = "8:_8E9B4D574D014738B94369502A191459"
          "MsmSig" = "8:_UNDEFINED"
          }
          "Entry"
          {
!         "MsmKey" = "8:_5336DC78D0FD4EBF93961224833C9322"
!         "OwnerKey" = "8:_287894F290604710B0E99CD646021261"
          "MsmSig" = "8:_UNDEFINED"
          }
          "Entry"
          {
!         "MsmKey" = "8:_5336DC78D0FD4EBF93961224833C9322"
!         "OwnerKey" = "8:_11AE7CD5CB2A43E395B33FDD50522940"
          "MsmSig" = "8:_UNDEFINED"
          }
          "Entry"
          {
!         "MsmKey" = "8:_5336DC78D0FD4EBF93961224833C9322"
!         "OwnerKey" = "8:_10B736524B444A95B8CC8D36B521F980"
          "MsmSig" = "8:_UNDEFINED"
          }
***************
*** 286,295 ****
          "Entry"
          {
-         "MsmKey" = "8:_7E5B1CDBD305476BA70FB25A72D0394D"
-         "OwnerKey" = "8:_287894F290604710B0E99CD646021261"
-         "MsmSig" = "8:_UNDEFINED"
-         }
-         "Entry"
-         {
          "MsmKey" = "8:_8CCEE5C8AADEB950D9A797DE0530965E"
          "OwnerKey" = "8:_A03B9AE58553491581FA0975DF6E6E88"
--- 310,313 ----
***************
*** 310,331 ****
          "Entry"
          {
-         "MsmKey" = "8:_9072A2B801F1499E88ACB4A475468E6D"
-         "OwnerKey" = "8:_A03B9AE58553491581FA0975DF6E6E88"
-         "MsmSig" = "8:_UNDEFINED"
-         }
-         "Entry"
-         {
-         "MsmKey" = "8:_9072A2B801F1499E88ACB4A475468E6D"
-         "OwnerKey" = "8:_11AE7CD5CB2A43E395B33FDD50522940"
-         "MsmSig" = "8:_UNDEFINED"
-         }
-         "Entry"
-         {
-         "MsmKey" = "8:_9072A2B801F1499E88ACB4A475468E6D"
-         "OwnerKey" = "8:_10B736524B444A95B8CC8D36B521F980"
-         "MsmSig" = "8:_UNDEFINED"
-         }
-         "Entry"
-         {
          "MsmKey" = "8:_942AAA28BB647CF0EF1C6137B296D4FE"
          "OwnerKey" = "8:_BD4EC7DFE26A40BA84001249533EC862"
--- 328,331 ----
***************
*** 376,385 ****
          "Entry"
          {
-         "MsmKey" = "8:_CA49372A18CC4D33B7D67D6536E31366"
-         "OwnerKey" = "8:_UNDEFINED"
-         "MsmSig" = "8:_UNDEFINED"
-         }
-         "Entry"
-         {
          "MsmKey" = "8:_F7B461AAFB7641F699DAEAF49904A662"
          "OwnerKey" = "8:_UNDEFINED"
--- 376,379 ----
***************
*** 796,819 ****
              "IsolateTo" = "8:"
              }
-             "{A582A373-4685-4296-BEFE-614B80A702C3}:_CA49372A18CC4D33B7D67D6536E31366"
-             {
-             "SourcePath" = "8:C:\\WINDOWS\\system32\\atl71.dll"
-             "TargetName" = "8:atl71.dll"
-             "Tag" = "8:"
-             "Folder" = "8:_B4A52EA52B0946A1AF1F0D1FA55A352F"
-             "Condition" = "8:"
-             "Transitive" = "11:FALSE"
-             "Vital" = "11:TRUE"
-             "ReadOnly" = "11:FALSE"
-             "Hidden" = "11:FALSE"
-             "System" = "11:FALSE"
-             "Permanent" = "11:FALSE"
-             "SharedLegacy" = "11:FALSE"
-             "PackageAs" = "3:1"
-             "Register" = "3:1"
-             "Exclude" = "11:FALSE"
-             "IsDependency" = "11:FALSE"
-             "IsolateTo" = "8:"
-             }
              "{A582A373-4685-4296-BEFE-614B80A702C3}:_FD2F9BAB00E2CB44E03A93E604085DE2"
              {
--- 790,793 ----
***************
*** 1372,1394 ****
          "MergeModule"
          {
!             "{35A69C6E-5BA4-440D-803D-762B59A45393}:_23FC18A2DEBB4DF98431626348FE3CE7"
              {
              "UseDynamicProperties" = "11:TRUE"
              "IsDependency" = "11:TRUE"
!             "SourcePath" = "8:vc_user_stl71_rtl_x86_---.msm"
                  "Properties"
                  {
                  }
              "LanguageId" = "3:0"
!             "Exclude" = "11:TRUE"
              "Folder" = "8:"
              "Feature" = "8:"
              "IsolateTo" = "8:"
              }
!             "{35A69C6E-5BA4-440D-803D-762B59A45393}:_2D197DBB587641E9BE042B361E9628D1"
              {
              "UseDynamicProperties" = "11:TRUE"
              "IsDependency" = "11:TRUE"
!             "SourcePath" = "8:VC_User_CRT71_RTL_X86_---.msm"
                  "Properties"
                  {
--- 1346,1368 ----
          "MergeModule"
          {
!             "{35A69C6E-5BA4-440D-803D-762B59A45393}:_154DE3989F9C45AFAF5E1E1FB0757E1D"
              {
              "UseDynamicProperties" = "11:TRUE"
              "IsDependency" = "11:TRUE"
!             "SourcePath" = "8:vc_user_atl71_rtl_x86_---.msm"
                  "Properties"
                  {
                  }
              "LanguageId" = "3:0"
!             "Exclude" = "11:FALSE"
              "Folder" = "8:"
              "Feature" = "8:"
              "IsolateTo" = "8:"
              }
!             "{35A69C6E-5BA4-440D-803D-762B59A45393}:_24505FDB0A3941A5BC465EB28A815DF0"
              {
              "UseDynamicProperties" = "11:TRUE"
              "IsDependency" = "11:TRUE"
!             "SourcePath" = "8:vc_user_crt71_rtl_x86_---.msm"
                  "Properties"
                  {
***************
*** 1400,1404 ****
              "IsolateTo" = "8:"
              }
!             "{35A69C6E-5BA4-440D-803D-762B59A45393}:_7E5B1CDBD305476BA70FB25A72D0394D"
              {
              "UseDynamicProperties" = "11:TRUE"
--- 1374,1378 ----
              "IsolateTo" = "8:"
              }
!             "{35A69C6E-5BA4-440D-803D-762B59A45393}:_413320C13C484EB5811353BECDEB123E"
              {
              "UseDynamicProperties" = "11:TRUE"
***************
*** 1414,1422 ****
              "IsolateTo" = "8:"
              }
!             "{35A69C6E-5BA4-440D-803D-762B59A45393}:_9072A2B801F1499E88ACB4A475468E6D"
              {
              "UseDynamicProperties" = "11:TRUE"
              "IsDependency" = "11:TRUE"
!             "SourcePath" = "8:VC_User_ATL71_RTL_X86_---.msm"
                  "Properties"
                  {
--- 1388,1396 ----
              "IsolateTo" = "8:"
              }
!             "{35A69C6E-5BA4-440D-803D-762B59A45393}:_5336DC78D0FD4EBF93961224833C9322"
              {
              "UseDynamicProperties" = "11:TRUE"
              "IsDependency" = "11:TRUE"
!             "SourcePath" = "8:vc_user_stl71_rtl_x86_---.msm"
                  "Properties"
                  {