[ObjectHandler-cvs] ObjectHandler/ohxl/ohxll ohxll.vcproj, 1.10, 1.11 ohxll_vc8.vcproj, 1.15, 1.16

[Eric E. <eri...@us...>]

Update of /cvsroot/objecthandler/ObjectHandler/ohxl/ohxll
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv25784/ohxl/ohxll

Modified Files:
	ohxll.vcproj ohxll_vc8.vcproj 
Log Message:
merge branch and increment version number

Index: ohxll_vc8.vcproj
===================================================================
RCS file: /cvsroot/objecthandler/ObjectHandler/ohxl/ohxll/ohxll_vc8.vcproj,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** ohxll_vc8.vcproj	18 Oct 2006 13:01:29 -0000	1.15
--- ohxll_vc8.vcproj	14 Dec 2006 12:27:36 -0000	1.16
***************
*** 76,86 ****
  				Name="VCLinkerTool"
  				AdditionalDependencies="odbc32.lib odbccp32.lib Ws2_32.lib advapi32.lib"
! 				OutputFile="..\..\xll\ObjectHandler-xll-vc80-mt-gd-0_1_5.xll"
  				LinkIncremental="2"
  				SuppressStartupBanner="true"
  				AdditionalLibraryDirectories="..\..\lib,$(LOG4CXX_DIR)\msvc\lib"
  				GenerateDebugInformation="true"
! 				ProgramDatabaseFile="..\..\xll/ObjectHandler-xll-vc80-mt-gd-0_1_5.pdb"
! 				ImportLibrary="..\..\xll/ObjectHandler-xll-vc80-mt-gd-0_1_5.lib"
  				TargetMachine="1"
  			/>
--- 76,86 ----
  				Name="VCLinkerTool"
  				AdditionalDependencies="odbc32.lib odbccp32.lib Ws2_32.lib advapi32.lib"
! 				OutputFile="..\..\xll\ObjectHandler-xll-vc80-mt-gd-0_2_0.xll"
  				LinkIncremental="2"
  				SuppressStartupBanner="true"
  				AdditionalLibraryDirectories="..\..\lib,$(LOG4CXX_DIR)\msvc\lib"
  				GenerateDebugInformation="true"
! 				ProgramDatabaseFile="..\..\xll/ObjectHandler-xll-vc80-mt-gd-0_2_0.pdb"
! 				ImportLibrary="..\..\xll/ObjectHandler-xll-vc80-mt-gd-0_2_0.lib"
  				TargetMachine="1"
  			/>
***************
*** 174,183 ****
  				Name="VCLinkerTool"
  				AdditionalDependencies="odbc32.lib odbccp32.lib Ws2_32.lib advapi32.lib"
! 				OutputFile="..\..\xll\ObjectHandler-xll-vc80-mt-0_1_5.xll"
  				LinkIncremental="1"
  				SuppressStartupBanner="true"
  				AdditionalLibraryDirectories="..\..\lib,$(LOG4CXX_DIR)\msvc\lib"
! 				ProgramDatabaseFile="..\..\xll/ObjectHandler-xll-vc80-mt-0_1_5.pdb"
! 				ImportLibrary="..\..\xll/ObjectHandler-xll-vc80-mt-0_1_5.lib"
  				TargetMachine="1"
  			/>
--- 174,183 ----
  				Name="VCLinkerTool"
  				AdditionalDependencies="odbc32.lib odbccp32.lib Ws2_32.lib advapi32.lib"
! 				OutputFile="..\..\xll\ObjectHandler-xll-vc80-mt-0_2_0.xll"
  				LinkIncremental="1"
  				SuppressStartupBanner="true"
  				AdditionalLibraryDirectories="..\..\lib,$(LOG4CXX_DIR)\msvc\lib"
! 				ProgramDatabaseFile="..\..\xll/ObjectHandler-xll-vc80-mt-0_2_0.pdb"
! 				ImportLibrary="..\..\xll/ObjectHandler-xll-vc80-mt-0_2_0.lib"
  				TargetMachine="1"
  			/>

Index: ohxll.vcproj
===================================================================
RCS file: /cvsroot/objecthandler/ObjectHandler/ohxl/ohxll/ohxll.vcproj,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** ohxll.vcproj	18 Oct 2006 13:01:29 -0000	1.10
--- ohxll.vcproj	14 Dec 2006 12:27:36 -0000	1.11
***************
*** 42,52 ****
  				Name="VCLinkerTool"
  				AdditionalDependencies="odbc32.lib odbccp32.lib Ws2_32.lib"
! 				OutputFile="..\..\xll\ObjectHandler-xll-vc71-mt-gd-0_1_5.xll"
  				LinkIncremental="2"
  				SuppressStartupBanner="TRUE"
  				AdditionalLibraryDirectories="..\..\lib,$(LOG4CXX_DIR)\msvc\Lib"
  				GenerateDebugInformation="TRUE"
! 				ProgramDatabaseFile="..\..\xll\ObjectHandler-xll-vc71-mt-gd-0_1_5.pdb"
! 				ImportLibrary="..\..\lib\ObjectHandler-xll-vc71-mt-gd-0_1_5.lib"
  				TargetMachine="1"/>
  			<Tool
--- 42,52 ----
  				Name="VCLinkerTool"
  				AdditionalDependencies="odbc32.lib odbccp32.lib Ws2_32.lib"
! 				OutputFile="..\..\xll\ObjectHandler-xll-vc71-mt-gd-0_2_0.xll"
  				LinkIncremental="2"
  				SuppressStartupBanner="TRUE"
  				AdditionalLibraryDirectories="..\..\lib,$(LOG4CXX_DIR)\msvc\Lib"
  				GenerateDebugInformation="TRUE"
! 				ProgramDatabaseFile="..\..\xll\ObjectHandler-xll-vc71-mt-gd-0_2_0.pdb"
! 				ImportLibrary="..\..\lib\ObjectHandler-xll-vc71-mt-gd-0_2_0.lib"
  				TargetMachine="1"/>
  			<Tool
***************
*** 110,119 ****
  				Name="VCLinkerTool"
  				AdditionalDependencies="odbc32.lib odbccp32.lib Ws2_32.lib"
! 				OutputFile="..\..\xll\ObjectHandler-xll-vc71-mt-0_1_5.xll"
  				LinkIncremental="2"
  				SuppressStartupBanner="TRUE"
  				AdditionalLibraryDirectories="..\..\lib,$(LOG4CXX_DIR)\msvc\Lib"
! 				ProgramDatabaseFile="..\..\xll\ObjectHandler-xll-vc71-mt-0_1_5.pdb"
! 				ImportLibrary="..\..\lib\ObjectHandler-xll-vc71-mt-0_1_5.lib"
  				TargetMachine="1"/>
  			<Tool
--- 110,119 ----
  				Name="VCLinkerTool"
  				AdditionalDependencies="odbc32.lib odbccp32.lib Ws2_32.lib"
! 				OutputFile="..\..\xll\ObjectHandler-xll-vc71-mt-0_2_0.xll"
  				LinkIncremental="2"
  				SuppressStartupBanner="TRUE"
  				AdditionalLibraryDirectories="..\..\lib,$(LOG4CXX_DIR)\msvc\Lib"
! 				ProgramDatabaseFile="..\..\xll\ObjectHandler-xll-vc71-mt-0_2_0.pdb"
! 				ImportLibrary="..\..\lib\ObjectHandler-xll-vc71-mt-0_2_0.lib"
  				TargetMachine="1"/>
  			<Tool