[NeXus-code-svn] r1133 - in branches/4.2: . applications bindings/python bindings/python/nxs contrib/bindings contrib/bindings/nxpylib contrib/bindings/nxpython contrib/bindings/python

[apache at nexusformat.org]

Author: Freddie Akeroyd
Date: Wed Dec  3 12:38:34 2008
New Revision: 1133

Added:
   branches/4.2/contrib/bindings/python/
      - copied from r1132, /trunk/contrib/bindings/python/
   branches/4.2/contrib/bindings/python/Makefile.am
      - copied unchanged from r1132, /trunk/contrib/bindings/python/Makefile.am
Removed:
   branches/4.2/bindings/python/nxs/tree.py
   branches/4.2/bindings/python/nxs/unit.py
   branches/4.2/bindings/python/setup.py
   branches/4.2/contrib/bindings/README.python
   branches/4.2/contrib/bindings/nxpylib/
   branches/4.2/contrib/bindings/nxpython/
Modified:
   branches/4.2/applications/nxvalidate.c
   branches/4.2/bindings/python/Makefile.am
   branches/4.2/bindings/python/nxs/__init__.py
   branches/4.2/configure.ac
   branches/4.2/contrib/bindings/Makefile.am

Log:
Merge 1126:1132 from trunk. Refs #115.


Modified: branches/4.2/applications/nxvalidate.c
Url: http://svn.nexusformat.org/viewvc/NeXusCode/branches/4.2/applications/nxvalidate.c?r1=1132&r2=1133

Modified: branches/4.2/bindings/python/Makefile.am
Url: http://svn.nexusformat.org/viewvc/NeXusCode/branches/4.2/bindings/python/Makefile.am?r1=1132&r2=1133

Modified: branches/4.2/bindings/python/nxs/__init__.py
Url: http://svn.nexusformat.org/viewvc/NeXusCode/branches/4.2/bindings/python/nxs/__init__.py?r1=1132&r2=1133

Modified: branches/4.2/configure.ac
Url: http://svn.nexusformat.org/viewvc/NeXusCode/branches/4.2/configure.ac?r1=1132&r2=1133

Modified: branches/4.2/contrib/bindings/Makefile.am
Url: http://svn.nexusformat.org/viewvc/NeXusCode/branches/4.2/contrib/bindings/Makefile.am?r1=1132&r2=1133