Author: bugman Date: Tue Aug 2 16:26:05 2011 New Revision: 14069 URL: http://svn.gna.org/viewcvs/relax?rev=14069&view=rev Log: Reverted r14068 as this svnmerge commit breaks the branch. The command used was: svn merge -r14068:14067 . Modified: branches/xyz/ (props changed) branches/xyz/generic_fns/structure/internal.py branches/xyz/info.py (props changed) branches/xyz/relax branches/xyz/relax.bat branches/xyz/relax_errors.py branches/xyz/relax_io.py branches/xyz/relax_warnings.py branches/xyz/status.py branches/xyz/test_suite/system_tests/structure.py [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/xyz/generic_fns/structure/internal.py URL: http://svn.gna.org/viewcvs/relax/branches/xyz/generic_fns/structure/internal.py?rev=14069&r1=14068&r2=14069&view=diff Modified: branches/xyz/relax URL: http://svn.gna.org/viewcvs/relax/branches/xyz/relax?rev=14069&r1=14068&r2=14069&view=diff Modified: branches/xyz/relax.bat URL: http://svn.gna.org/viewcvs/relax/branches/xyz/relax.bat?rev=14069&r1=14068&r2=14069&view=diff Modified: branches/xyz/relax_errors.py URL: http://svn.gna.org/viewcvs/relax/branches/xyz/relax_errors.py?rev=14069&r1=14068&r2=14069&view=diff Modified: branches/xyz/relax_io.py URL: http://svn.gna.org/viewcvs/relax/branches/xyz/relax_io.py?rev=14069&r1=14068&r2=14069&view=diff Modified: branches/xyz/relax_warnings.py URL: http://svn.gna.org/viewcvs/relax/branches/xyz/relax_warnings.py?rev=14069&r1=14068&r2=14069&view=diff Modified: branches/xyz/status.py URL: http://svn.gna.org/viewcvs/relax/branches/xyz/status.py?rev=14069&r1=14068&r2=14069&view=diff Modified: branches/xyz/test_suite/system_tests/structure.py URL: http://svn.gna.org/viewcvs/relax/branches/xyz/test_suite/system_tests/structure.py?rev=14069&r1=14068&r2=14069&view=diff