[NeXus-code-svn] r1868 - in branches/4.3: . InstallerBits applications applications/NXbrowse applications/NXconvert applications/NXtranslate applications/NXtranslate/FRM2 applications/NXtranslate/binary applications/NXtranslate/esrf_edf applications/NXtranslate/sns_histogram applications/NXtranslate/spec applications/NXtranslate/text_collist applications/NXtranslate/text_xml applications/NXvalidate applications/nxingest bindings/cpp bindings/idl bindings/java bindings/python cmake_include cmake_modules include src

[apache at nexusformat.org]

Author: Freddie Akeroyd
Date: Fri Feb  1 15:50:16 2013
New Revision: 1868

Added:
   branches/4.3/InstallerBits/nexus.ico
      - copied unchanged from r1867, /trunk/InstallerBits/nexus.ico
   branches/4.3/README.cmake
      - copied unchanged from r1867, /trunk/README.cmake
   branches/4.3/applications/NXvalidate/nxvalidate.bat.in
      - copied unchanged from r1867, /trunk/applications/NXvalidate/nxvalidate.bat.in
   branches/4.3/cmake_include/WELCOME.txt
      - copied unchanged from r1867, /trunk/cmake_include/WELCOME.txt
   branches/4.3/cmake_modules/
      - copied from r1867, /trunk/cmake_modules/
   branches/4.3/configure_cmake_build.bat
      - copied unchanged from r1867, /trunk/configure_cmake_build.bat
   branches/4.3/dir_syntax.cmake
      - copied unchanged from r1867, /trunk/dir_syntax.cmake
   branches/4.3/nsis_uninstall.nsh
      - copied unchanged from r1867, /trunk/nsis_uninstall.nsh
Modified:
   branches/4.3/   (props changed)
   branches/4.3/CMakeLists.txt
   branches/4.3/CPackOptions.cmake.in
   branches/4.3/SConstruct
   branches/4.3/applications/NXbrowse/CMakeLists.txt
   branches/4.3/applications/NXbrowse/NXbrowse.c
   branches/4.3/applications/NXconvert/nxconvert_common.cpp
   branches/4.3/applications/NXtranslate/FRM2/frm2_retriever.cpp
   branches/4.3/applications/NXtranslate/binary/BinaryRetriever.cpp
   branches/4.3/applications/NXtranslate/esrf_edf/edf_retriever.cpp
   branches/4.3/applications/NXtranslate/sns_histogram/SNS_retriever.cpp
   branches/4.3/applications/NXtranslate/spec/spec_retriever.cpp
   branches/4.3/applications/NXtranslate/string_util.cpp
   branches/4.3/applications/NXtranslate/text_collist/collist_retriever.cpp
   branches/4.3/applications/NXtranslate/text_xml/xml_retriever.cpp
   branches/4.3/applications/NXvalidate/CMakeLists.txt
   branches/4.3/applications/nxdiff
   branches/4.3/applications/nxdiff.1
   branches/4.3/applications/nxingest/CMakeLists.txt
   branches/4.3/bindings/cpp/CMakeLists.txt
   branches/4.3/bindings/cpp/NeXusFile.cpp
   branches/4.3/bindings/idl/README.html   (props changed)
   branches/4.3/bindings/java/CMakeLists.txt
   branches/4.3/bindings/python/CMakeLists.txt
   branches/4.3/cmake_include/FindHDF4.cmake
   branches/4.3/cmake_include/FindHDF5.cmake
   branches/4.3/cmake_include/FindMXML.cmake
   branches/4.3/cmake_include/FindSZIP.cmake
   branches/4.3/cmake_include/WELCOME
   branches/4.3/include/nxconfig_h_cmake.in
   branches/4.3/nexus_scons_utils.py
   branches/4.3/nsis_install.nsh
   branches/4.3/nsis_unsinstall.nsh
   branches/4.3/src/CMakeLists.txt

Log:
Merge trunk changes [1832] to [1867] refs #306 


Modified: branches/4.3/CMakeLists.txt
Url: http://svn.nexusformat.org/viewvc/NeXusCode/branches/4.3/CMakeLists.txt?r1=1867&r2=1868

Modified: branches/4.3/CPackOptions.cmake.in
Url: http://svn.nexusformat.org/viewvc/NeXusCode/branches/4.3/CPackOptions.cmake.in?r1=1867&r2=1868

Modified: branches/4.3/applications/NXbrowse/CMakeLists.txt
Url: http://svn.nexusformat.org/viewvc/NeXusCode/branches/4.3/applications/NXbrowse/CMakeLists.txt?r1=1867&r2=1868

Modified: branches/4.3/applications/NXbrowse/NXbrowse.c
Url: http://svn.nexusformat.org/viewvc/NeXusCode/branches/4.3/applications/NXbrowse/NXbrowse.c?r1=1867&r2=1868

Modified: branches/4.3/applications/NXconvert/nxconvert_common.cpp
Url: http://svn.nexusformat.org/viewvc/NeXusCode/branches/4.3/applications/NXconvert/nxconvert_common.cpp?r1=1867&r2=1868

Modified: branches/4.3/applications/NXtranslate/FRM2/frm2_retriever.cpp
Url: http://svn.nexusformat.org/viewvc/NeXusCode/branches/4.3/applications/NXtranslate/FRM2/frm2_retriever.cpp?r1=1867&r2=1868

Modified: branches/4.3/applications/NXtranslate/binary/BinaryRetriever.cpp
Url: http://svn.nexusformat.org/viewvc/NeXusCode/branches/4.3/applications/NXtranslate/binary/BinaryRetriever.cpp?r1=1867&r2=1868

Modified: branches/4.3/applications/NXtranslate/esrf_edf/edf_retriever.cpp
Url: http://svn.nexusformat.org/viewvc/NeXusCode/branches/4.3/applications/NXtranslate/esrf_edf/edf_retriever.cpp?r1=1867&r2=1868

Modified: branches/4.3/applications/NXtranslate/sns_histogram/SNS_retriever.cpp
Url: http://svn.nexusformat.org/viewvc/NeXusCode/branches/4.3/applications/NXtranslate/sns_histogram/SNS_retriever.cpp?r1=1867&r2=1868

Modified: branches/4.3/applications/NXtranslate/spec/spec_retriever.cpp
Url: http://svn.nexusformat.org/viewvc/NeXusCode/branches/4.3/applications/NXtranslate/spec/spec_retriever.cpp?r1=1867&r2=1868

Modified: branches/4.3/applications/NXtranslate/string_util.cpp
Url: http://svn.nexusformat.org/viewvc/NeXusCode/branches/4.3/applications/NXtranslate/string_util.cpp?r1=1867&r2=1868

Modified: branches/4.3/applications/NXtranslate/text_collist/collist_retriever.cpp
Url: http://svn.nexusformat.org/viewvc/NeXusCode/branches/4.3/applications/NXtranslate/text_collist/collist_retriever.cpp?r1=1867&r2=1868

Modified: branches/4.3/applications/NXtranslate/text_xml/xml_retriever.cpp
Url: http://svn.nexusformat.org/viewvc/NeXusCode/branches/4.3/applications/NXtranslate/text_xml/xml_retriever.cpp?r1=1867&r2=1868

Modified: branches/4.3/applications/NXvalidate/CMakeLists.txt
Url: http://svn.nexusformat.org/viewvc/NeXusCode/branches/4.3/applications/NXvalidate/CMakeLists.txt?r1=1867&r2=1868

Modified: branches/4.3/applications/nxdiff
Url: http://svn.nexusformat.org/viewvc/NeXusCode/branches/4.3/applications/nxdiff?r1=1867&r2=1868

Modified: branches/4.3/applications/nxdiff.1
Url: http://svn.nexusformat.org/viewvc/NeXusCode/branches/4.3/applications/nxdiff.1?r1=1867&r2=1868

Modified: branches/4.3/applications/nxingest/CMakeLists.txt
Url: http://svn.nexusformat.org/viewvc/NeXusCode/branches/4.3/applications/nxingest/CMakeLists.txt?r1=1867&r2=1868

Modified: branches/4.3/bindings/cpp/CMakeLists.txt
Url: http://svn.nexusformat.org/viewvc/NeXusCode/branches/4.3/bindings/cpp/CMakeLists.txt?r1=1867&r2=1868

Modified: branches/4.3/bindings/cpp/NeXusFile.cpp
Url: http://svn.nexusformat.org/viewvc/NeXusCode/branches/4.3/bindings/cpp/NeXusFile.cpp?r1=1867&r2=1868

Modified: branches/4.3/bindings/java/CMakeLists.txt
Url: http://svn.nexusformat.org/viewvc/NeXusCode/branches/4.3/bindings/java/CMakeLists.txt?r1=1867&r2=1868

Modified: branches/4.3/bindings/python/CMakeLists.txt
Url: http://svn.nexusformat.org/viewvc/NeXusCode/branches/4.3/bindings/python/CMakeLists.txt?r1=1867&r2=1868

Modified: branches/4.3/cmake_include/FindHDF4.cmake
Url: http://svn.nexusformat.org/viewvc/NeXusCode/branches/4.3/cmake_include/FindHDF4.cmake?r1=1867&r2=1868

Modified: branches/4.3/cmake_include/FindHDF5.cmake
Url: http://svn.nexusformat.org/viewvc/NeXusCode/branches/4.3/cmake_include/FindHDF5.cmake?r1=1867&r2=1868

Modified: branches/4.3/cmake_include/FindMXML.cmake
Url: http://svn.nexusformat.org/viewvc/NeXusCode/branches/4.3/cmake_include/FindMXML.cmake?r1=1867&r2=1868

Modified: branches/4.3/cmake_include/FindSZIP.cmake
Url: http://svn.nexusformat.org/viewvc/NeXusCode/branches/4.3/cmake_include/FindSZIP.cmake?r1=1867&r2=1868

Modified: branches/4.3/include/nxconfig_h_cmake.in
Url: http://svn.nexusformat.org/viewvc/NeXusCode/branches/4.3/include/nxconfig_h_cmake.in?r1=1867&r2=1868

Modified: branches/4.3/nsis_install.nsh
Url: http://svn.nexusformat.org/viewvc/NeXusCode/branches/4.3/nsis_install.nsh?r1=1867&r2=1868

Modified: branches/4.3/src/CMakeLists.txt
Url: http://svn.nexusformat.org/viewvc/NeXusCode/branches/4.3/src/CMakeLists.txt?r1=1867&r2=1868