summaryrefslogtreecommitdiffstats
path: root/windows_vnet/proj
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2008-06-18 16:58:08 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2008-06-18 16:58:08 (GMT)
commit3c3a1388df917a17e863a59675e2d4ba4606af15 (patch)
tree3ac9c3260c89124d1fc907cc89191c2b96937f1b /windows_vnet/proj
parent5f840fac789821f1b6acf951725b148971b8ae18 (diff)
downloadhdf5-3c3a1388df917a17e863a59675e2d4ba4606af15.zip
hdf5-3c3a1388df917a17e863a59675e2d4ba4606af15.tar.gz
hdf5-3c3a1388df917a17e863a59675e2d4ba4606af15.tar.bz2
[svn-r15231] Description:
Merge revisions 14525:14700 from trunk into metadata journaling branch Tested on: FreeBSD/32 6.2 (duty) in debug mode FreeBSD/64 6.2 (liberty) w/C++ & FORTRAN, in debug mode Linux/32 2.6 (kagiso) w/PGI compilers, w/C++ & FORTRAN, w/threadsafe, in debug mode Linux/64-amd64 2.6 (smirom) w/default API=1.6.x, w/C++ & FORTRAN, in production mode Linux/64-ia64 2.6 (cobalt) w/Intel compilers, w/C++ & FORTRAN, in production mode Solaris/32 2.10 (linew) w/deprecated symbols disabled, w/C++ & FORTRAN, w/szip filter, in production mode Mac OS X/32 10.5.2 (amazon) in debug mode Linux/64-ia64 2.4 (tg-login3) w/parallel, w/FORTRAN, in production mode
Diffstat (limited to 'windows_vnet/proj')
-rw-r--r--windows_vnet/proj/all/all.sln1
1 files changed, 1 insertions, 0 deletions
diff --git a/windows_vnet/proj/all/all.sln b/windows_vnet/proj/all/all.sln
index 5b28435..980c93e 100644
--- a/windows_vnet/proj/all/all.sln
+++ b/windows_vnet/proj/all/all.sln
@@ -663,6 +663,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hdf5_cppdll", "..\hdf5_cppd
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hdf5_hl", "..\hdf5_hl\hdf5_hl.vcproj", "{4FC6670C-1339-4C34-9A5D-08D06A644256}"
ProjectSection(ProjectDependencies) = postProject
+ {BB439F14-D29D-4A05-9AB0-0B08682721DE} = {BB439F14-D29D-4A05-9AB0-0B08682721DE}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hdf5_hl_cpp", "..\hdf5_hl_cpp\hdf5_hl_cpp.vcproj", "{CFCAEA96-B431-4EED-BE7B-C22FA99C6157}"