Author: bugman Date: Thu Oct 16 00:17:30 2008 New Revision: 7734 URL: http://svn.gna.org/viewcvs/relax?rev=7734&view=rev Log: Merged all that could be merged from r3267. The 2 commands used were: svn merge -r3266:3267 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/multi_processor . svn merge -r3266:3267 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/multi_processor/specific_fns/model_free.py specific_fns/model_free/mf_minimise.py The grid search code was skipped as it is in minfx (https://gna.org/projects/minfx/). ..... r3267 | varioustoxins | 2007-04-17 00:54:48 +0200 (Tue, 17 Apr 2007) | 2 lines Changed paths: M /branches/multi_processor/minimise/generic.py M /branches/multi_processor/minimise/grid.py M /branches/multi_processor/multi/commands.py M /branches/multi_processor/specific_fns/model_free.py fully operative grid search (uniprocessor broken) ..... Modified: branches/multi_processor_merge/multi/commands.py branches/multi_processor_merge/specific_fns/model_free/mf_minimise.py [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/multi_processor_merge/multi/commands.py URL: http://svn.gna.org/viewcvs/relax/branches/multi_processor_merge/multi/commands.py?rev=7734&r1=7733&r2=7734&view=diff Modified: branches/multi_processor_merge/specific_fns/model_free/mf_minimise.py URL: http://svn.gna.org/viewcvs/relax/branches/multi_processor_merge/specific_fns/model_free/mf_minimise.py?rev=7734&r1=7733&r2=7734&view=diff