Author: bugman
Date: Thu Oct 18 13:42:01 2012
New Revision: 17920
URL: http://svn.gna.org/viewcvs/relax?rev=17920&view=rev
Log:
Merged revisions 17898-17900,17906,17911-17912,17914-17915 via svnmerge from
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk
........
r17898 | bugman | 2012-10-17 15:22:04 +0200 (Wed, 17 Oct 2012) | 3 lines
Decreased the Python version dependency from 2.5 to 2.3 in the installation
chapter of the user manual.
........
r17899 | bugman | 2012-10-17 15:29:19 +0200 (Wed, 17 Oct 2012) | 3 lines
Small edit to the installation chapter of the user manual.
........
r17900 | bugman | 2012-10-17 15:29:41 +0200 (Wed, 17 Oct 2012) | 3 lines
The scons 'clean' target now removes the Python 3 __pycache__ directories.
........
r17906 | bugman | 2012-10-17 17:23:05 +0200 (Wed, 17 Oct 2012) | 6 lines
Merged the relax version 2.1.2 CHANGES file back to trunk.
The command used was:
svn merge -r17904:17905 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/tags/2.1.2 .
........
r17911 | bugman | 2012-10-17 22:43:22 +0200 (Wed, 17 Oct 2012) | 7 lines
Scons fix for MS Windows.
A bug was introduced back at r17786 which causes scons to fail on MS
Windows. This has to do with
the ctypes.Structure object but strangely led to a AttributeError importing
scipy when initialising
scons.
........
r17912 | bugman | 2012-10-17 22:53:41 +0200 (Wed, 17 Oct 2012) | 3 lines
Another attempt at fixing the scons failure in MS Windows due to scipy and
ctypes killing each other.
........
r17914 | bugman | 2012-10-18 10:56:05 +0200 (Thu, 18 Oct 2012) | 7 lines
The relax HTML user manual footer has been modified to remove the name of
the person who compiled it.
This is for http://www.nmr-relax.com/manual/index.html, and now contains
links for relax
(http://www.nmr-relax.com), the manual (http://www.nmr-relax.com/manual)
and the PDF version of the
manual (http://download.gna.org/relax/manual/relax.pdf).
........
r17915 | bugman | 2012-10-18 10:56:41 +0200 (Thu, 18 Oct 2012) | 3 lines
Small syntax fix in the release checklist document.
........
Modified:
branches/relax_disp/ (props changed)
branches/relax_disp/dep_check.py
branches/relax_disp/docs/CHANGES
branches/relax_disp/docs/Release_Checklist
branches/relax_disp/docs/latex/.latex2html-init
branches/relax_disp/docs/latex/install.tex
branches/relax_disp/info.py
branches/relax_disp/sconstruct
[This mail would be too long, it was shortened to contain the URLs only.]
Modified: branches/relax_disp/dep_check.py
URL:
http://svn.gna.org/viewcvs/relax/branches/relax_disp/dep_check.py?rev=17920&r1=17919&r2=17920&view=diff
Modified: branches/relax_disp/docs/CHANGES
URL:
http://svn.gna.org/viewcvs/relax/branches/relax_disp/docs/CHANGES?rev=17920&r1=17919&r2=17920&view=diff
Modified: branches/relax_disp/docs/Release_Checklist
URL:
http://svn.gna.org/viewcvs/relax/branches/relax_disp/docs/Release_Checklist?rev=17920&r1=17919&r2=17920&view=diff
Modified: branches/relax_disp/docs/latex/.latex2html-init
URL:
http://svn.gna.org/viewcvs/relax/branches/relax_disp/docs/latex/.latex2html-init?rev=17920&r1=17919&r2=17920&view=diff
Modified: branches/relax_disp/docs/latex/install.tex
URL:
http://svn.gna.org/viewcvs/relax/branches/relax_disp/docs/latex/install.tex?rev=17920&r1=17919&r2=17920&view=diff
Modified: branches/relax_disp/info.py
URL:
http://svn.gna.org/viewcvs/relax/branches/relax_disp/info.py?rev=17920&r1=17919&r2=17920&view=diff
Modified: branches/relax_disp/sconstruct
URL:
http://svn.gna.org/viewcvs/relax/branches/relax_disp/sconstruct?rev=17920&r1=17919&r2=17920&view=diff
r17920 - in /branches/relax_disp: ./ docs/ docs/latex/