[NeXus-code-svn] r1863 - in branches/4.3: applications/NXconvert applications/NXdir applications/NXtranslate bindings/java bindings/python include src

[apache at nexusformat.org]

Author: Tobias Richter
Date: Mon Dec 17 14:06:34 2012
New Revision: 1863

Added:
   branches/4.3/bindings/java/ignore-index.html
      - copied, changed from r1833, /branches/4.3/bindings/java/index.html
Modified:
   branches/4.3/applications/NXconvert/Makefile.am
   branches/4.3/applications/NXdir/data_writer.cpp
   branches/4.3/applications/NXdir/tree.cpp
   branches/4.3/applications/NXtranslate/main.cpp
   branches/4.3/applications/NXtranslate/string_util.h
   branches/4.3/applications/NXtranslate/xml_parser.h
   branches/4.3/bindings/java/index.html
   branches/4.3/bindings/python/Makefile.am
   branches/4.3/include/napi.h
   branches/4.3/src/napi.c
   branches/4.3/src/napi5.c
   branches/4.3/src/napiu.c
   branches/4.3/src/nxdataset.c
   branches/4.3/src/stptok.c

Log:
pull most safe changes from master

refs #341

Modified: branches/4.3/applications/NXconvert/Makefile.am
Url: http://svn.nexusformat.org/viewvc/NeXusCode/branches/4.3/applications/NXconvert/Makefile.am?r1=1862&r2=1863

Modified: branches/4.3/applications/NXdir/data_writer.cpp
Url: http://svn.nexusformat.org/viewvc/NeXusCode/branches/4.3/applications/NXdir/data_writer.cpp?r1=1862&r2=1863

Modified: branches/4.3/applications/NXdir/tree.cpp
Url: http://svn.nexusformat.org/viewvc/NeXusCode/branches/4.3/applications/NXdir/tree.cpp?r1=1862&r2=1863

Modified: branches/4.3/applications/NXtranslate/main.cpp
Url: http://svn.nexusformat.org/viewvc/NeXusCode/branches/4.3/applications/NXtranslate/main.cpp?r1=1862&r2=1863

Modified: branches/4.3/applications/NXtranslate/string_util.h
Url: http://svn.nexusformat.org/viewvc/NeXusCode/branches/4.3/applications/NXtranslate/string_util.h?r1=1862&r2=1863

Modified: branches/4.3/applications/NXtranslate/xml_parser.h
Url: http://svn.nexusformat.org/viewvc/NeXusCode/branches/4.3/applications/NXtranslate/xml_parser.h?r1=1862&r2=1863

Modified: branches/4.3/bindings/python/Makefile.am
Url: http://svn.nexusformat.org/viewvc/NeXusCode/branches/4.3/bindings/python/Makefile.am?r1=1862&r2=1863

Modified: branches/4.3/include/napi.h
Url: http://svn.nexusformat.org/viewvc/NeXusCode/branches/4.3/include/napi.h?r1=1862&r2=1863

Modified: branches/4.3/src/napi.c
Url: http://svn.nexusformat.org/viewvc/NeXusCode/branches/4.3/src/napi.c?r1=1862&r2=1863

Modified: branches/4.3/src/napi5.c
Url: http://svn.nexusformat.org/viewvc/NeXusCode/branches/4.3/src/napi5.c?r1=1862&r2=1863

Modified: branches/4.3/src/napiu.c
Url: http://svn.nexusformat.org/viewvc/NeXusCode/branches/4.3/src/napiu.c?r1=1862&r2=1863

Modified: branches/4.3/src/nxdataset.c
Url: http://svn.nexusformat.org/viewvc/NeXusCode/branches/4.3/src/nxdataset.c?r1=1862&r2=1863

Modified: branches/4.3/src/stptok.c
Url: http://svn.nexusformat.org/viewvc/NeXusCode/branches/4.3/src/stptok.c?r1=1862&r2=1863