Re: r10996 - in /branches/bieri_gui: ./ auto_analyses/ generic_fns/ generic_fns/structure/ prompt/ sample_scripts/ specific_fns/... -- March 15, 2010 - 22:17

There was no conflict. Surprisingly, everything was fine!


Edward d'Auvergne schrieb:
> Hi Michael,
>
> I was just wondering, did this 'svnmerge merge' command result in any
> conflicts?  If so, how did you resolve them?
>
> Cheers,
>
> Edward
>
>
> On 14 March 2010 23:41,  <michael.bieri@xxxxxx> wrote:
>   
> > Author: michaelbieri
> > Date: Sun Mar 14 23:41:23 2010
> > New Revision: 10996
> >
> > URL: http://svn.gna.org/viewcvs/relax?rev=10996&view=rev
> > Log:
> > Merged revisions 10878-10879,10881-10884,10937-10958,10961-10990 via svnmerge 
> > from
> > svn+ssh://michaelbieri@xxxxxxxxxxx/svn/relax/1.3
> >
> > ........
> >  r10878 | bugman | 2010-02-24 09:43:16 +1100 (Mit, 24 Feb 2010) | 3 lines
> >
> >  Added the DOI number for the d'Auvergne and Gooley 2003 ref.
> > ........
> >  r10879 | bugman | 2010-02-24 10:12:17 +1100 (Mit, 24 Feb 2010) | 6 lines
> >
> >  Expanded the references to include a number of new variables.
> >
> >  These include 'type', 'status', 'journal_full', and 'author2'.  These will 
> > be used mainly in the
> >  BMRB branch.
> > ........
> >  r10881 | bugman | 2010-02-24 10:37:37 +1100 (Mit, 24 Feb 2010) | 3 lines
> >
> >  Added defaults values of None for the ref class variables.
> > ........
> >  r10882 | bugman | 2010-02-24 10:40:51 +1100 (Mit, 24 Feb 2010) | 3 lines
> >
> >  Added the Sparky reference.
> > ........
> >  r10883 | bugman | 2010-02-24 11:00:01 +1100 (Mit, 24 Feb 2010) | 5 lines
> >
> >  Added a __getattr__() method for generating variables on the fly.
> >
> >  This is being used to create the 'page_first' and 'page_last' objects.
> > ........
> >  r10884 | bugman | 2010-02-24 11:20:46 +1100 (Mit, 24 Feb 2010) | 3 lines
> >
> >  Added the NMRPipe reference.
> > ........
> >  r10937 | bugman | 2010-02-25 22:36:30 +1100 (Don, 25 Feb 2010) | 10 lines
> >
> >  Addition of the relax status singleton object.
> >
> >  See https://mail.gna.org/public/relax-devel/2010-01/msg00094.html and other 
> > related posts in the
> >  thread.
> >
> >  The idea is that various parts of relax deposit status information into here 
> > that other parts of
> >  relax can then use.  For example the Monte Carlo code can place the current 
> > simulation number in
> >  there while the relax GUI controller can read these values.
> > ........
> >  r10938 | bugman | 2010-02-25 23:52:35 +1100 (Don, 25 Feb 2010) | 6 lines
> >
> >  The Monte Carlo simulation number is now present in the status singleton.
> >
> >  The value of status.mc_number is set to the simulation number (starting at 
> > 0) and at the end is
> >  reset to None.
> > ........
> >  r10939 | bugman | 2010-02-26 00:37:11 +1100 (Fre, 26 Feb 2010) | 11 lines
> >
> >  All of the relevant status information about the dAuvergne_protocol 
> > auto-analysis is being stored.
> >
> >  This includes:
> >      status.dAuvergne_protocol.diff_model = None        # The global 
> > diffusion model.
> >      status.dAuvergne_protocol.round = None             # The round of 
> > optimisation, i.e. the global iteration.
> >      status.dAuvergne_protocol.mf_models = None         # The list of 
> > model-free models for optimisation, i.e. the global iteration.
> >      status.dAuvergne_protocol.local_mf_models = None   # The list of 
> > model-free local tm models for optimisation, i.e. the global iteration.
> >      status.dAuvergne_protocol.current_model = None     # The current 
> > model-free model.
> >      status.dAuvergne_protocol.convergence = False      # The convergence of 
> > the global model.
> > ........
> >  r10940 | bugman | 2010-02-26 00:59:08 +1100 (Fre, 26 Feb 2010) | 7 lines
> >
> >  Bug fix and updates to the generic_fns.angles.wrap_angles() function.
> >
> >  This was not wrapping correctly when the window was not between 0 and 2pi.  
> > Epydoc tags have been
> >  added to the docstring, the window size can now be specified and is checked 
> > against the bounds as a
> >  sanity check, and comments have been added all over.
> > ........
> >  r10941 | bugman | 2010-02-26 01:15:09 +1100 (Fre, 26 Feb 2010) | 5 lines
> >
> >  Fix for a bug introduced in the last revision (r10940).
> >
> >  This affects the spherical angles used to define the spheroidal diffusion 
> > tensor major axis.
> > ........
> >  r10942 | bugman | 2010-02-26 01:16:53 +1100 (Fre, 26 Feb 2010) | 5 lines
> >
> >  Added a new function fold_spherical_angles() for removing symmetry from 
> > spherical angles.
> >
> >  This will be useful for future use of these angles.
> > ........
> >  r10943 | bugman | 2010-02-26 01:19:38 +1100 (Fre, 26 Feb 2010) | 5 lines
> >
> >  The fold_spherical_angles() performs a second wrapping in case the angles 
> > shift out of the window.
> >
> >  Window size checks have also been added.
> > ........
> >  r10944 | bugman | 2010-02-26 01:25:02 +1100 (Fre, 26 Feb 2010) | 5 lines
> >
> >  Added default lower and upper bounds to fold_spherical_angles().
> >
> >  More epydoc tags have been added.
> > ........
> >  r10945 | bugman | 2010-02-26 01:31:51 +1100 (Fre, 26 Feb 2010) | 3 lines
> >
> >  The spheroidal diffusion tensor major axis angles are now folded using 
> > angles.fold_spherical_angles().
> > ........
> >  r10946 | bugman | 2010-02-26 01:55:32 +1100 (Fre, 26 Feb 2010) | 3 lines
> >
> >  Fix for the angles system test for the new folding of the spherical angles.
> > ........
> >  r10947 | bugman | 2010-02-26 02:37:43 +1100 (Fre, 26 Feb 2010) | 7 lines
> >
> >  Removed the iteration count check in the test_opt_rigid_rand_rot() system 
> > test.
> >
> >  This number is different on a PowerPC chip with Mac OS X, even if the 
> > parameter values are
> >  identical.  This was identified by Jack Howarth (howarth att bromo dot med 
> > dot uc dot edu) in the
> >  post https://mail.gna.org/public/relax-users/2010-02/msg00025.html.
> > ........
> >  r10948 | bugman | 2010-02-27 02:36:59 +1100 (Sam, 27 Feb 2010) | 9 lines
> >
> >  Partially removed the need for Fink specific modifications.
> >
> >  This removes the need for the patch given by Jack Howarth <howarth att bromo 
> > dot med dot uc dot edu>
> >  in the message https://mail.gna.org/public/relax-users/2010-02/msg00031.html.
> >
> >  A similar python specific path was being used to find Python.h on all 
> > architectures, so the include
> >  path was copied and modified to be a bin path.
> > ........
> >  r10949 | bugman | 2010-03-09 21:06:06 +1100 (Die, 09 Mär 2010) | 6 lines
> >
> >  Bug fix for the N-state model cone PDB creation _cone_pdb() method.
> >
> >  The internal structural API had changed.  structure.add_struct() is now 
> > called
> >  structure.add_molecule().
> > ........
> >  r10950 | bugman | 2010-03-09 21:11:05 +1100 (Die, 09 Mär 2010) | 5 lines
> >
> >  Fix for the N-state model user function n_state_model.cone_pdb().
> >
> >  This was not calling the correct method.
> > ........
> >  r10951 | bugman | 2010-03-09 21:15:26 +1100 (Die, 09 Mär 2010) | 5 lines
> >
> >  Removed the pipe test from the pymol.cone_pdb() user function.
> >
> >  This check is not necessary as a data pipe is not needed for this.
> > ........
> >  r10952 | bugman | 2010-03-09 21:44:48 +1100 (Die, 09 Mär 2010) | 5 lines
> >
> >  Added a new module for holding class objects defining different cone types.
> >
> >  This currently contains the Iso_cone class with the simple method phi_max() 
> > to return the cone edge.
> > ........
> >  r10953 | bugman | 2010-03-09 21:50:48 +1100 (Die, 09 Mär 2010) | 5 lines
> >
> >  The cone_edge() method now calls a function to obtain the maximum polar 
> > angle.
> >
> >  The cone_edge() arg 'angle' has been changed to 'phi_max_fn'.
> > ........
> >  r10954 | bugman | 2010-03-09 21:51:38 +1100 (Die, 09 Mär 2010) | 3 lines
> >
> >  The frame order and N-state model cone_pdb() methods now use the isotropic 
> > cone object.
> > ........
> >  r10955 | bugman | 2010-03-09 23:14:32 +1100 (Die, 09 Mär 2010) | 3 lines
> >
> >  Added a new cone type in the Pseudo_elliptic class.
> > ........
> >  r10956 | bugman | 2010-03-10 01:29:59 +1100 (Mit, 10 Mär 2010) | 3 lines
> >
> >  The limit_check() method has been added to the cone objects to determine if 
> > a point is inside or not.
> > ........
> >  r10957 | bugman | 2010-03-10 05:11:18 +1100 (Mit, 10 Mär 2010) | 7 lines
> >
> >  Converted generate_vector_dist() to use a limit checking function and 
> > simplified the code.
> >
> >  The angle arrays are now returned by uniform_vect_dist_spherical_angles() so 
> > that
> >  generate_vector_dist() can use any spherical point distribution.  The 
> > max_angle arg has been changed
> >  to limit_check so that any type of vector distribution can be created.
> > ........
> >  r10958 | bugman | 2010-03-10 05:23:46 +1100 (Mit, 10 Mär 2010) | 5 lines
> >
> >  Shifted the calculation of the uniform sphere point positions into 
> > angles_uniform().
> >
> >  This removes this replicated code from various functions, allowing for more 
> > flexibility.
> > ........
> >  r10961 | bugman | 2010-03-10 20:07:35 +1100 (Mit, 10 Mär 2010) | 3 lines
> >
> >  Modified stitch_cone_to_edge() to use the new cone limits function.
> > ........
> >  r10962 | bugman | 2010-03-11 02:59:32 +1100 (Don, 11 Mär 2010) | 9 lines
> >
> >  The diffusion tensor within the PDB frame can now be specified.
> >
> >  This avoids all Euler angle convention problems.
> >
> >  -This line, and those below, will be ignored--
> >
> >  M    prompt/diffusion_tensor.py
> >  M    generic_fns/diffusion_tensor.py
> > ........
> >  r10963 | bugman | 2010-03-11 03:33:53 +1100 (Don, 11 Mär 2010) | 5 lines
> >
> >  Shifted the model-free _back_calc() method into the analysis specific API as 
> > back_calc_ri().
> >
> >  This is now being called by the relax_data.back_calc() user function.
> > ........
> >  r10964 | bugman | 2010-03-11 03:38:17 +1100 (Don, 11 Mär 2010) | 3 lines
> >
> >  The back_calc_ri() analysis specific API method has been activated.
> > ........
> >  r10965 | bugman | 2010-03-11 03:39:33 +1100 (Don, 11 Mär 2010) | 6 lines
> >
> >  Fixes for the back_calc() method.
> >
> >  The find_index() function was already defined (so renamed to 
> > find_ri_index()), and the analysis
> >  specific API back_calc_ri() method was incorrectly called.
> > ........
> >  r10966 | bugman | 2010-03-11 04:02:28 +1100 (Don, 11 Mär 2010) | 3 lines
> >
> >  Comment fixes - relax handles spins, not residues now.
> > ........
> >  r10967 | bugman | 2010-03-11 04:27:06 +1100 (Don, 11 Mär 2010) | 5 lines
> >
> >  Fix for the back_calc_ri() API method.
> >
> >  Spins are now skipped if no bond vector information is present (for the 
> > spheroids and ellipsoids).
> > ........
> >  r10968 | bugman | 2010-03-11 04:28:30 +1100 (Don, 11 Mär 2010) | 3 lines
> >
> >  Fix for the back_calc() function - if the back-calculation returns no value, 
> > the spin is skipped.
> > ........
> >  r10969 | bugman | 2010-03-11 04:31:25 +1100 (Don, 11 Mär 2010) | 5 lines
> >
> >  Updated the generate_ri.py sample script to work with the current relax code 
> > base.
> >
> >  This code was old and broken.  A copyright notice has been added.
> > ........
> >  r10970 | bugman | 2010-03-11 04:45:10 +1100 (Don, 11 Mär 2010) | 3 lines
> >
> >  The back-calculation of Ri data via model-free and diffusion tensors has 
> > been added to the system tests.
> > ........
> >  r10971 | bugman | 2010-03-11 06:18:42 +1100 (Don, 11 Mär 2010) | 3 lines
> >
> >  Added the cones module to the __all__ package list.
> > ........
> >  r10972 | bugman | 2010-03-11 06:23:23 +1100 (Don, 11 Mär 2010) | 5 lines
> >
> >  Added theta_max() methods to all the isotropic cone classes.
> >
> >  This is for determining theta from the phi polar angle.
> > ........
> >  r10973 | bugman | 2010-03-11 06:26:26 +1100 (Don, 11 Mär 2010) | 3 lines
> >
> >  Modified the cone_edge() function to add atoms for the latitude lines as 
> > well.
> > ........
> >  r10974 | bugman | 2010-03-11 21:31:06 +1100 (Don, 11 Mär 2010) | 3 lines
> >
> >  Rewrote the stitch_cone_to_edge() function to handle the arbitrarily shaped 
> > cones.
> > ........
> >  r10975 | bugman | 2010-03-11 21:46:06 +1100 (Don, 11 Mär 2010) | 3 lines
> >
> >  cone_pdb() now takes the new EDG residue for the cone edge into account.
> > ........
> >  r10976 | bugman | 2010-03-11 23:36:22 +1100 (Don, 11 Mär 2010) | 3 lines
> >
> >  Created the new fn create_cone_pdb() which can be used to create PDB file 
> > representations of cones.
> > ........
> >  r10977 | bugman | 2010-03-11 23:40:24 +1100 (Don, 11 Mär 2010) | 3 lines
> >
> >  Fix for create_cone_pdb() for when a rotation matrix is supplied.
> > ........
> >  r10978 | bugman | 2010-03-11 23:42:36 +1100 (Don, 11 Mär 2010) | 5 lines
> >
> >  Bug fix for cone_edge() for when a rotation matrix is supplied.
> >
> >  The latitude points were not being rotated.
> > ........
> >  r10979 | bugman | 2010-03-11 23:44:26 +1100 (Don, 11 Mär 2010) | 5 lines
> >
> >  Bug fix for create_cone_pdb() for when a rotation matrix is supplied.
> >
> >  The cone central axis was not being rotated!
> > ........
> >  r10980 | bugman | 2010-03-11 23:45:57 +1100 (Don, 11 Mär 2010) | 3 lines
> >
> >  Renamed the pivot point to the apex in create_cone_pdb().
> > ........
> >  r10981 | bugman | 2010-03-12 01:54:13 +1100 (Fre, 12 Mär 2010) | 5 lines
> >
> >  Various point distributions can now be used for the cone PDB representations.
> >
> >  This includes the original 'uniform' distribution and now the 'regular' 
> > distribution.
> > ........
> >  r10982 | bugman | 2010-03-12 20:27:05 +1100 (Fre, 12 Mär 2010) | 3 lines
> >
> >  Fix for the cone_edge() function for a non-zero apex position.
> > ........
> >  r10983 | bugman | 2010-03-12 21:43:27 +1100 (Fre, 12 Mär 2010) | 6 lines
> >
> >  Bug fix for back_calc_ri()!
> >
> >  The bug was introduced at r10967.  The check for missing data was not 
> > performing correctly, causing
> >  the Monte Carlo simulations to be stuck in an infinite loop!
> > ........
> >  r10984 | bugman | 2010-03-12 21:55:46 +1100 (Fre, 12 Mär 2010) | 5 lines
> >
> >  Bug fix for the generate_vector_dist() function.
> >
> >  The limits function was being called even if not supplied!  This change 
> > fixes that.
> > ........
> >  r10985 | bugman | 2010-03-13 01:02:29 +1100 (Sam, 13 Mär 2010) | 5 lines
> >
> >  Removed the pipe check from the pymol.command() user function.
> >
> >  This is not necessary.
> > ........
> >  r10986 | bugman | 2010-03-13 05:20:40 +1100 (Sam, 13 Mär 2010) | 3 lines
> >
> >  Added the import of pymol modules to the dependency checks.
> > ........
> >  r10987 | bugman | 2010-03-13 05:45:37 +1100 (Sam, 13 Mär 2010) | 7 lines
> >
> >  Started to redesign the generic_fns.pymol module to use the pymol python 
> > package.
> >
> >  This involves much renaming of the PyMOL pipe object which is not the PyMOL 
> > executable object.  This
> >  attempts to use the pymol python package, and if not available PyMOL will be 
> > run from the command
> >  line as a pipe.
> > ........
> >  r10988 | bugman | 2010-03-13 05:49:27 +1100 (Sam, 13 Mär 2010) | 3 lines
> >
> >  Renamed the prompt and generic_fns pymol modules to pymol_control to avoid 
> > the clash with real PyMOL.
> > ........
> >  r10989 | bugman | 2010-03-13 05:56:55 +1100 (Sam, 13 Mär 2010) | 5 lines
> >
> >  Renamed the initialised PyMOL executable object from 'pymol' to 'pymol_ob'.
> >
> >  This is to avoid the name clash with the pymol python package.
> > ........
> >  r10990 | bugman | 2010-03-14 22:13:15 +1100 (Son, 14 Mär 2010) | 3 lines
> >
> >  Added a series of new cone types to generic_fns.structure.cones.
> > ........
> >
> > Added:
> >    branches/bieri_gui/generic_fns/pymol_control.py
> >      - copied unchanged from r10990, 1.3/generic_fns/pymol_control.py
> >    branches/bieri_gui/generic_fns/structure/cones.py
> >      - copied unchanged from r10990, 1.3/generic_fns/structure/cones.py
> >    branches/bieri_gui/prompt/pymol_control.py
> >      - copied unchanged from r10990, 1.3/prompt/pymol_control.py
> >    branches/bieri_gui/status.py
> >      - copied unchanged from r10990, 1.3/status.py
> >    branches/bieri_gui/test_suite/system_tests/scripts/generate_ri.py
> >      - copied unchanged from r10990, 
> > 1.3/test_suite/system_tests/scripts/generate_ri.py
> > Removed:
> >    branches/bieri_gui/generic_fns/pymol.py
> >    branches/bieri_gui/prompt/pymol.py
> > Modified:
> >    branches/bieri_gui/   (props changed)
> >    branches/bieri_gui/auto_analyses/dauvergne_protocol.py
> >    branches/bieri_gui/dep_check.py
> >    branches/bieri_gui/generic_fns/angles.py
> >    branches/bieri_gui/generic_fns/diffusion_tensor.py
> >    branches/bieri_gui/generic_fns/minimise.py
> >    branches/bieri_gui/generic_fns/relax_data.py
> >    branches/bieri_gui/generic_fns/structure/__init__.py
> >    branches/bieri_gui/generic_fns/structure/geometric.py
> >    branches/bieri_gui/info.py
> >    branches/bieri_gui/prompt/diffusion_tensor.py
> >    branches/bieri_gui/prompt/interpreter.py
> >    branches/bieri_gui/prompt/n_state_model.py
> >    branches/bieri_gui/sample_scripts/generate_ri.py
> >    branches/bieri_gui/sconstruct
> >    branches/bieri_gui/specific_fns/api_base.py
> >    branches/bieri_gui/specific_fns/frame_order.py
> >    branches/bieri_gui/specific_fns/model_free/main.py
> >    branches/bieri_gui/specific_fns/n_state_model.py
> >    branches/bieri_gui/specific_fns/setup.py
> >    branches/bieri_gui/test_suite/system_tests/angles.py
> >    branches/bieri_gui/test_suite/system_tests/frame_order.py
> >    branches/bieri_gui/test_suite/system_tests/model_free.py
> >    branches/bieri_gui/test_suite/unit_tests/diffusion_tensor_testing_base.py
> >
> > [This mail would be too long, it was shortened to contain the URLs only.]
> >
> > Modified: branches/bieri_gui/auto_analyses/dauvergne_protocol.py
> > URL: 
> > http://svn.gna.org/viewcvs/relax/branches/bieri_gui/auto_analyses/dauvergne_protocol.py?rev=10996&r1=10995&r2=10996&view=diff
> >
> > Modified: branches/bieri_gui/dep_check.py
> > URL: 
> > http://svn.gna.org/viewcvs/relax/branches/bieri_gui/dep_check.py?rev=10996&r1=10995&r2=10996&view=diff
> >
> > Modified: branches/bieri_gui/generic_fns/angles.py
> > URL: 
> > http://svn.gna.org/viewcvs/relax/branches/bieri_gui/generic_fns/angles.py?rev=10996&r1=10995&r2=10996&view=diff
> >
> > Modified: branches/bieri_gui/generic_fns/diffusion_tensor.py
> > URL: 
> > http://svn.gna.org/viewcvs/relax/branches/bieri_gui/generic_fns/diffusion_tensor.py?rev=10996&r1=10995&r2=10996&view=diff
> >
> > Modified: branches/bieri_gui/generic_fns/minimise.py
> > URL: 
> > http://svn.gna.org/viewcvs/relax/branches/bieri_gui/generic_fns/minimise.py?rev=10996&r1=10995&r2=10996&view=diff
> >
> > Removed: branches/bieri_gui/generic_fns/pymol.py
> > URL: 
> > http://svn.gna.org/viewcvs/relax/branches/bieri_gui/generic_fns/pymol.py?rev=10995&view=auto
> >
> > Modified: branches/bieri_gui/generic_fns/relax_data.py
> > URL: 
> > http://svn.gna.org/viewcvs/relax/branches/bieri_gui/generic_fns/relax_data.py?rev=10996&r1=10995&r2=10996&view=diff
> >
> > Modified: branches/bieri_gui/generic_fns/structure/__init__.py
> > URL: 
> > http://svn.gna.org/viewcvs/relax/branches/bieri_gui/generic_fns/structure/__init__.py?rev=10996&r1=10995&r2=10996&view=diff
> >
> > Modified: branches/bieri_gui/generic_fns/structure/geometric.py
> > URL: 
> > http://svn.gna.org/viewcvs/relax/branches/bieri_gui/generic_fns/structure/geometric.py?rev=10996&r1=10995&r2=10996&view=diff
> >
> > Modified: branches/bieri_gui/info.py
> > URL: 
> > http://svn.gna.org/viewcvs/relax/branches/bieri_gui/info.py?rev=10996&r1=10995&r2=10996&view=diff
> >
> > Modified: branches/bieri_gui/prompt/diffusion_tensor.py
> > URL: 
> > http://svn.gna.org/viewcvs/relax/branches/bieri_gui/prompt/diffusion_tensor.py?rev=10996&r1=10995&r2=10996&view=diff
> >
> > Modified: branches/bieri_gui/prompt/interpreter.py
> > URL: 
> > http://svn.gna.org/viewcvs/relax/branches/bieri_gui/prompt/interpreter.py?rev=10996&r1=10995&r2=10996&view=diff
> >
> > Modified: branches/bieri_gui/prompt/n_state_model.py
> > URL: 
> > http://svn.gna.org/viewcvs/relax/branches/bieri_gui/prompt/n_state_model.py?rev=10996&r1=10995&r2=10996&view=diff
> >
> > Removed: branches/bieri_gui/prompt/pymol.py
> > URL: 
> > http://svn.gna.org/viewcvs/relax/branches/bieri_gui/prompt/pymol.py?rev=10995&view=auto
> >
> > Modified: branches/bieri_gui/sample_scripts/generate_ri.py
> > URL: 
> > http://svn.gna.org/viewcvs/relax/branches/bieri_gui/sample_scripts/generate_ri.py?rev=10996&r1=10995&r2=10996&view=diff
> >
> > Modified: branches/bieri_gui/sconstruct
> > URL: 
> > http://svn.gna.org/viewcvs/relax/branches/bieri_gui/sconstruct?rev=10996&r1=10995&r2=10996&view=diff
> >
> > Modified: branches/bieri_gui/specific_fns/api_base.py
> > URL: 
> > http://svn.gna.org/viewcvs/relax/branches/bieri_gui/specific_fns/api_base.py?rev=10996&r1=10995&r2=10996&view=diff
> >
> > Modified: branches/bieri_gui/specific_fns/frame_order.py
> > URL: 
> > http://svn.gna.org/viewcvs/relax/branches/bieri_gui/specific_fns/frame_order.py?rev=10996&r1=10995&r2=10996&view=diff
> >
> > Modified: branches/bieri_gui/specific_fns/model_free/main.py
> > URL: 
> > http://svn.gna.org/viewcvs/relax/branches/bieri_gui/specific_fns/model_free/main.py?rev=10996&r1=10995&r2=10996&view=diff
> >
> > Modified: branches/bieri_gui/specific_fns/n_state_model.py
> > URL: 
> > http://svn.gna.org/viewcvs/relax/branches/bieri_gui/specific_fns/n_state_model.py?rev=10996&r1=10995&r2=10996&view=diff
> >
> > Modified: branches/bieri_gui/specific_fns/setup.py
> > URL: 
> > http://svn.gna.org/viewcvs/relax/branches/bieri_gui/specific_fns/setup.py?rev=10996&r1=10995&r2=10996&view=diff
> >
> > Modified: branches/bieri_gui/test_suite/system_tests/angles.py
> >
> > [... 11 lines stripped ...]
> >
> > _______________________________________________
> > relax (http://nmr-relax.com)
> >
> > This is the relax-commits mailing list
> > relax-commits@xxxxxxx
> >
> > To unsubscribe from this list, get a password
> > reminder, or change your subscription options,
> > visit the list information page at
> > https://mail.gna.org/listinfo/relax-commits
> >
> >     
>
> _______________________________________________
> relax (http://nmr-relax.com)
>
> This is the relax-devel mailing list
> relax-devel@xxxxxxx
>
> To unsubscribe from this list, get a password
> reminder, or change your subscription options,
> visit the list information page at
> https://mail.gna.org/listinfo/relax-devel
>
>