r2575 - in /1.2: docs/relax.pdf errors.py generic_fns/pdb.py relax -- September 20, 2006 - 09:35

Author: bugman
Date: Wed Sep 20 09:35:16 2006
New Revision: 2575

URL: http://svn.gna.org/viewcvs/relax?rev=2575&view=rev
Log:
Merged the 'warning' branch into the 1.2 line.

The command used was:
svn merge -r2539:2574 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/warning

The merge was discussed at 
https://mail.gna.org/public/relax-devel/2006-09/msg00003.html (Message-id: 
<7f080ed10609130743t4e07d46cy213ff84ca1e35ea8@xxxxxxxxxxxxxx>).


Modified:
    1.2/docs/relax.pdf
    1.2/errors.py
    1.2/generic_fns/pdb.py
    1.2/relax

[This mail would be too long, it was shortened to contain the URLs only.]

Modified: 1.2/docs/relax.pdf
URL: 
http://svn.gna.org/viewcvs/relax/1.2/docs/relax.pdf?rev=2575&r1=2574&r2=2575&view=diff

Modified: 1.2/errors.py
URL: 
http://svn.gna.org/viewcvs/relax/1.2/errors.py?rev=2575&r1=2574&r2=2575&view=diff

Modified: 1.2/generic_fns/pdb.py
URL: 
http://svn.gna.org/viewcvs/relax/1.2/generic_fns/pdb.py?rev=2575&r1=2574&r2=2575&view=diff

Modified: 1.2/relax
URL: 
http://svn.gna.org/viewcvs/relax/1.2/relax?rev=2575&r1=2574&r2=2575&view=diff