[GME-commit] GMESRC/Install ISFeatureMergeModules.idt,1.4,1.5 ISMergeModule.idt,1.4,1.5 ISMergeModuleCfgValues.idt,1.2,1.3

[gme-commit at list.isis.vanderbilt.edu]

Update of /project/gme-repository/GMESRC/Install
In directory escher:/tmp/cvs-serv19943/Install

Modified Files:
	ISFeatureMergeModules.idt ISMergeModule.idt 
	ISMergeModuleCfgValues.idt 
Log Message:
Release 5.6.22

CVS User: Peter Volgyesi, ISIS (volgy)

Index: ISMergeModuleCfgValues.idt
===================================================================
RCS file: /project/gme-repository/GMESRC/Install/ISMergeModuleCfgValues.idt,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ISMergeModuleCfgValues.idt	28 Jul 2004 13:21:03 -0000	1.2
--- ISMergeModuleCfgValues.idt	22 Jun 2005 21:26:26 -0000	1.3
***************
*** 5,6 ****
--- 5,7 ----
  MDAC28.E7D6BCFA_9BFA_49D4_A1EE_767B7FD61E38	1033	MDAC28_INSTALL_SEQUENCE	EXEC	1	Property	Public	EXEC	2	MDAC 2.8 Install Location	Setting this value to "UI" will install MDAC 2.8 before the Install Welcome dialog launches. The setup will then reboot the machine and continue.		
  MDAC28.E7D6BCFA_9BFA_49D4_A1EE_767B7FD61E38	1033	MDAC28_INSTALL_REBOOT	0	1	Property	Public	0	2	MDAC 2.8 Reboot Location	Setting this value to "1" will force a reboot soon after MDAC is installed. Try adding a condition of "Not AFTERREBOOT" to InstallWelcome in the InstallUISequence for a better end-user experience.		
+ VC_User_gdiPlus.3B694ABE_4410_11D5_A54A_0090278A1BB8	0	DIR_RETARGET_TARGETDIR	TARGETDIR	1	Directory	IsolationDir	TARGETDIR	2	Module Retargetable Folder			

Index: ISFeatureMergeModules.idt
===================================================================
RCS file: /project/gme-repository/GMESRC/Install/ISFeatureMergeModules.idt,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ISFeatureMergeModules.idt	7 Apr 2005 20:48:14 -0000	1.4
--- ISFeatureMergeModules.idt	22 Jun 2005 21:26:26 -0000	1.5
***************
*** 6,9 ****
--- 6,10 ----
  GMEApplication	VC_User_ATL71.15ACF2F5_9BDB_4FFF_9C85_9814946343FF	0
  GMEApplication	VC_User_CRT71.07D8793C_DC93_47EF_8FDA_3517BC941A0F	0
+ GMEApplication	VC_User_gdiPlus.3B694ABE_4410_11D5_A54A_0090278A1BB8	0
  GMEApplication	VC_User_MFC71.211ADFCA_ED54_4E97_A0C1_80845B72BE77	0
  GMEApplication	VC_User_STL71.09528776_2EA8_4A65_AA88_693146381D7D	0

Index: ISMergeModule.idt
===================================================================
RCS file: /project/gme-repository/GMESRC/Install/ISMergeModule.idt,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ISMergeModule.idt	7 Apr 2005 20:48:14 -0000	1.4
--- ISMergeModule.idt	22 Jun 2005 21:26:26 -0000	1.5
***************
*** 6,9 ****
--- 6,10 ----
  VC_User_ATL71.15ACF2F5_9BDB_4FFF_9C85_9814946343FF	0	VC User ATL71 RTL X86 ---		
  VC_User_CRT71.07D8793C_DC93_47EF_8FDA_3517BC941A0F	0	VC User CRT71 RTL X86 ---		
+ VC_User_gdiPlus.3B694ABE_4410_11D5_A54A_0090278A1BB8	0	VC User gdiPlus RTL X86 ---		
  VC_User_MFC71.211ADFCA_ED54_4E97_A0C1_80845B72BE77	0	VC User MFC71 RTL X86 ---		
  VC_User_STL71.09528776_2EA8_4A65_AA88_693146381D7D	0	VC User STL71 RTL X86 ---