relax SVN archive

Molecular dynamics by NMR data analysis

Brought to you by: edauvergne, troelslinnet

Commit [r4703] Maximize Restore History

Reverted the 'svnmerge merge' generated r4702.

The command used was:
svn merge -r4702:4701 .

Not all files had been properly updated due to the following error:

svnmerge: command execution failed (exit code: 1)
svn log --incremental -r4679 svn+ssh://bugman@.../svn/relax/1.3
ssh_exchange_identification: Connection closed by remote host
svn: Connection closed unexpectedly

Authored by: bugman 2008-01-14

Browse code at this revision

Parent: [r4702]

Child: [r4704]

1 2 3 > >> (Page 1 of 3)

changed	/branches/N_state_model
changed	/branches/N_state_model/generic_fns/pipes.py
changed	/branches/N_state_model/maths_fns/chi2.py
changed	/branches/N_state_model/maths_fns/correlation_time.py
changed	/branches/N_state_model/maths_fns/direction_cosine.py
changed	/branches/N_state_model/maths_fns/jw_mapping.py
changed	/branches/N_state_model/maths_fns/jw_mf.py
changed	/branches/N_state_model/maths_fns/jw_mf_comps.py
changed	/branches/N_state_model/maths_fns/mf.py
changed	/branches/N_state_model/maths_fns/ri.py
changed	/branches/N_state_model/maths_fns/ri_comps.py
changed	/branches/N_state_model/maths_fns/weights.py
changed	/branches/N_state_model/minimise/bfgs.py
changed	/branches/N_state_model/minimise/cauchy_point.py
changed	/branches/N_state_model/minimise/constraint_linear.py
changed	/branches/N_state_model/minimise/coordinate_descent.py
changed	/branches/N_state_model/minimise/dogleg.py
changed	/branches/N_state_model/minimise/exact_trust_region.py
changed	/branches/N_state_model/minimise/fletcher_reeves_cg.py
changed	/branches/N_state_model/minimise/generic.py
changed	/branches/N_state_model/minimise/grid.py
changed	/branches/N_state_model/minimise/hessian_mods/cholesky.py
changed	/branches/N_state_model/minimise/hessian_mods/eigenvalue.py
changed	/branches/N_state_model/minimise/hessian_mods/gmw81.py
changed	/branches/N_state_model/minimise/hessian_mods/gmw81_old.py