Merging of the xyz branch into the main 1.3 line (as well as the multi_processor and gui_testing branches). -- August 11, 2011 - 11:31

Hi Han,

I have now merged your xyz branch into the main 1.3 line.  There was
only one conflict in this process, and it was easy enough to fix.  I
have now run the test suite, and noticed that the
test_read_xyz_internal2 system test fails.  This can be quickly
checked with:

$ ./relax -s Structure.test_read_xyz_internal2

I think I remember seeing this problem before, but I thought that it
was solved in the xyz branch.  Could you check the 1.3 line and see if
all your code is in there?  Or check what could be the source of this
problem?  I would like to release a new version of relax soon with
this code (along with a series of bug fixes) prior to releasing a new
version with Gary Thompson's multiprocessor code, and then a version
with the new GUI code (hopefully all by the end of next week).

Cheers,

Edward