Merge remote-tracking branch 'origin/master' into hdf5 96/11196/3
Sylvestre Ledru [Wed, 3 Apr 2013 08:00:31 +0000 (10:00 +0200)]
Conflicts:
scilab/modules/hdf5/sci_gateway/cpp/sci_export_to_hdf5.cpp
scilab/modules/hdf5/src/c/hdf5.vcxproj

Change-Id: I6fbb3c02a6543180ab29c38df41d24e4f7bd83e5

1  2 
scilab/modules/hdf5/Makefile.am
scilab/modules/hdf5/Makefile.in
scilab/modules/hdf5/sci_gateway/cpp/sci_import_from_hdf5.cpp
scilab/modules/hdf5/sci_gateway/cpp/sci_listvar_in_hdf5.cpp
scilab/modules/hdf5/src/c/h5_readDataFromFile.c
scilab/modules/hdf5/src/c/h5_writeDataToFile.c
scilab/modules/hdf5/src/c/hdf5.vcxproj

Simple merge
Simple merge
    <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
    <ImportGroup Label="ExtensionTargets">
    </ImportGroup>
--</Project>
++</Project>