Author: bugman
Date: Fri Sep 13 14:53:31 2013
New Revision: 21003
URL: http://svn.gna.org/viewcvs/relax?rev=21003&view=rev
Log:
Merged revisions 21000-21002 via svnmerge from
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk
........
r21000 | bugman | 2013-09-13 14:52:30 +0200 (Fri, 13 Sep 2013) | 8 lines
Fix for bibtex warning 'Warning--string name "mb" is undefined'.
Progress sr #3071: https://gna.org/support/index.php?3071 - Implementation
of Tollinger/Kay dispersion model (2001)
Following the guide at:
http://wiki.nmr-relax.com/Tutorial_for_adding_relaxation_dispersion_models_to_relax
Troels E. Linnet provided this patch. Commit by: tlinnet _aaattt_
gmail_dot_com
Signed-off-by: Edward d'Auvergne <edward@xxxxxxxxxxxxx>
........
r21001 | bugman | 2013-09-13 14:52:32 +0200 (Fri, 13 Sep 2013) | 8 lines
Fix for latex bibtex string 'cp' instead of 'cj'.
Progress sr #3071: https://gna.org/support/index.php?3071 - Implementation
of Tollinger/Kay dispersion model (2001)
Following the guide at:
http://wiki.nmr-relax.com/Tutorial_for_adding_relaxation_dispersion_models_to_relax
Troels E. Linnet provided this patch. Commit by: tlinnet _aaattt_
gmail_dot_com
Signed-off-by: Edward d'Auvergne <edward@xxxxxxxxxxxxx>
........
r21002 | bugman | 2013-09-13 14:52:33 +0200 (Fri, 13 Sep 2013) | 8 lines
Another fix for bibtex string 'cp' instead of 'cj'.
Progress sr #3071: https://gna.org/support/index.php?3071 - Implementation
of Tollinger/Kay dispersion model (2001)
Following the guide at:
http://wiki.nmr-relax.com/Tutorial_for_adding_relaxation_dispersion_models_to_relax
Troels E. Linnet provided this patch. Commit by: tlinnet _aaattt_
gmail_dot_com
Signed-off-by: Edward d'Auvergne <edward@xxxxxxxxxxxxx>
........
Modified:
branches/relax_disp/ (props changed)
branches/relax_disp/docs/latex/bibliography.bib
Propchange: branches/relax_disp/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Sep 13 14:53:31 2013
@@ -1,1 +1,1 @@
-/trunk:1-20957
+/trunk:1-21002
Modified: branches/relax_disp/docs/latex/bibliography.bib
URL:
http://svn.gna.org/viewcvs/relax/branches/relax_disp/docs/latex/bibliography.bib?rev=21003&r1=21002&r2=21003&view=diff
==============================================================================
--- branches/relax_disp/docs/latex/bibliography.bib (original)
+++ branches/relax_disp/docs/latex/bibliography.bib Fri Sep 13 14:53:31 2013
@@ -66,6 +66,9 @@
% Journal of Research of the National Bureau of Standards.
@STRING{jrnbs = "J. Res. Natn. Bur. Stand."}
+
+% Molecular BioSystems.
+@STRING{mb = "Mol. BioSyst."}
% Mathematics of Computation.
@STRING{mc = "Math. Comp."}
@@ -2190,7 +2193,7 @@
@Article{Fletcher70,
Author = {Fletcher, R.},
Title = {A new approach to variable metric algorithms},
- Journal = cp,
+ Journal = cj,
Volume = {13},
Number = {3},
Pages = {317-322},
@@ -2215,7 +2218,7 @@
@Article{FletcherReeves64,
Author = {Fletcher, R. and Reeves, C. M.},
Title = {Function minimization by conjugate gradients},
- Journal = cp,
+ Journal = cj,
Volume = {7},
Number = {2},
Pages = {149-154},
r21003 - in /branches/relax_disp: ./ docs/latex/bibliography.bib