Re: r13946 - in /branches/xyz: ./ auto_analyses/ data/ generic_fns/ generic_fns/structure/ graphics/oxygen_icons/16x16/actions/ ...

Thu, 28 Jul 2011 02:18:42 -0700 

Hi Edward,

I think I have solved the conflict, and now the test passes. :)

Best,
Han


On Jul 28, 2011, at 11:17 AM, [email protected] wrote:


Author: han87
Date: Thu Jul 28 11:17:09 2011
New Revision: 13946

URL: http://svn.gna.org/viewcvs/relax?rev=13946&view=rev
Log:
Merge the changes from the 1.3 line to xyz branch
Several changes to the 1.3 lines were made by Edward d'Auvergne to fix many problems in xyz branch, as indicated in the emails:https:// mail.gna.org/public/relax-devel/2011-07/msg00033.html and https:// mail.gna.org/public/relax-devel/2011-07/msg00028.html. These changes are now included in the xyz branch. 

Added:
branches/xyz/graphics/oxygen_icons/16x16/actions/document- close.png - copied unchanged from r13932, 1.3/graphics/oxygen_icons/ 16x16/actions/document-close.png branches/xyz/graphics/oxygen_icons/16x16/actions/document-open- folder.png - copied unchanged from r13932, 1.3/graphics/oxygen_icons/ 16x16/actions/document-open-folder.png branches/xyz/graphics/oxygen_icons/22x22/actions/document- close.png - copied unchanged from r13932, 1.3/graphics/oxygen_icons/ 22x22/actions/document-close.png 
    branches/xyz/graphics/oxygen_icons/22x22/actions/document-new.png
- copied unchanged from r13932, 1.3/graphics/oxygen_icons/ 22x22/actions/document-new.png branches/xyz/graphics/oxygen_icons/22x22/actions/document-open- folder.png - copied unchanged from r13932, 1.3/graphics/oxygen_icons/ 22x22/actions/document-open-folder.png branches/xyz/graphics/oxygen_icons/32x32/actions/document- close.png - copied unchanged from r13932, 1.3/graphics/oxygen_icons/ 32x32/actions/document-close.png 
    branches/xyz/graphics/oxygen_icons/32x32/actions/document-new.png
- copied unchanged from r13932, 1.3/graphics/oxygen_icons/ 32x32/actions/document-new.png branches/xyz/graphics/oxygen_icons/32x32/actions/document-open- folder.png - copied unchanged from r13932, 1.3/graphics/oxygen_icons/ 32x32/actions/document-open-folder.png branches/xyz/graphics/oxygen_icons/48x48/actions/document- close.png - copied unchanged from r13932, 1.3/graphics/oxygen_icons/ 48x48/actions/document-close.png 
    branches/xyz/graphics/oxygen_icons/48x48/actions/document-new.png
- copied unchanged from r13932, 1.3/graphics/oxygen_icons/ 48x48/actions/document-new.png branches/xyz/graphics/oxygen_icons/48x48/actions/document-open- folder.png - copied unchanged from r13932, 1.3/graphics/oxygen_icons/ 48x48/actions/document-open-folder.png 
    branches/xyz/scripts/byte_compile
      - copied unchanged from r13932, 1.3/scripts/byte_compile
    branches/xyz/test_suite/shared_data/model_free/sphere/
- copied from r13932, 1.3/test_suite/shared_data/model_free/ sphere/ 
Modified:
    branches/xyz/   (props changed)
    branches/xyz/auto_analyses/dauvergne_protocol.py
    branches/xyz/auto_analyses/noe.py
    branches/xyz/data/__init__.py
    branches/xyz/generic_fns/mol_res_spin.py
    branches/xyz/generic_fns/pcs.py
    branches/xyz/generic_fns/pipes.py
    branches/xyz/generic_fns/relax_data.py
    branches/xyz/generic_fns/sequence.py
    branches/xyz/generic_fns/spectrum.py
    branches/xyz/generic_fns/structure/geometric.py
    branches/xyz/generic_fns/structure/internal.py
    branches/xyz/generic_fns/structure/main.py
    branches/xyz/generic_fns/value.py
    branches/xyz/gui/analyses/auto_model_free.py
    branches/xyz/gui/analyses/auto_noe.py
    branches/xyz/gui/analyses/auto_rx_base.py
    branches/xyz/gui/analyses/base.py
    branches/xyz/gui/analyses/results.py
    branches/xyz/gui/components/spectrum.py
    branches/xyz/gui/menu.py
    branches/xyz/gui/misc.py
    branches/xyz/gui/paths.py
    branches/xyz/gui/relax_gui.py
    branches/xyz/gui/settings.py
    branches/xyz/gui/user_functions/spin.py
    branches/xyz/prompt/relax_data.py
    branches/xyz/prompt/structure.py
    branches/xyz/prompt/value.py
    branches/xyz/relax_io.py
    branches/xyz/sample_scripts/generate_ri.py
branches/xyz/sample_scripts/n_state_model/ conformation_analysis_rdc+pcs.py 
    branches/xyz/specific_fns/api_base.py
    branches/xyz/specific_fns/api_common.py
    branches/xyz/specific_fns/consistency_tests.py
    branches/xyz/specific_fns/jw_mapping.py
    branches/xyz/specific_fns/model_free/main.py
    branches/xyz/specific_fns/relax_fit.py
    branches/xyz/specific_fns/setup.py
branches/xyz/test_suite/shared_data/align_data/population_model/ generate.py 
    branches/xyz/test_suite/system_tests/model_free.py
    branches/xyz/test_suite/system_tests/relax_fit.py
branches/xyz/test_suite/system_tests/scripts/n_state_model/ lactose_n_state.py branches/xyz/test_suite/system_tests/scripts/n_state_model/ missing_data_test.py branches/xyz/test_suite/system_tests/scripts/n_state_model/ populations.py branches/xyz/test_suite/system_tests/scripts/n_state_model/ vector_loading.py 
    branches/xyz/test_suite/system_tests/scripts/relax_fit.py
    branches/xyz/test_suite/system_tests/structure.py
[This mail would be too long, it was shortened to contain the URLs only.] 

Modified: branches/xyz/auto_analyses/dauvergne_protocol.py
URL: http://svn.gna.org/viewcvs/relax/branches/xyz/auto_analyses/ dauvergne_protocol.py?rev=13946&r1=13945&r2=13946&view=diff 

Modified: branches/xyz/auto_analyses/noe.py
URL: http://svn.gna.org/viewcvs/relax/branches/xyz/auto_analyses/ noe.py?rev=13946&r1=13945&r2=13946&view=diff 

Modified: branches/xyz/data/__init__.py
URL: http://svn.gna.org/viewcvs/relax/branches/xyz/data/__init__.py? rev=13946&r1=13945&r2=13946&view=diff 

Modified: branches/xyz/generic_fns/mol_res_spin.py
URL: http://svn.gna.org/viewcvs/relax/branches/xyz/generic_fns/ mol_res_spin.py?rev=13946&r1=13945&r2=13946&view=diff 

Modified: branches/xyz/generic_fns/pcs.py
URL: http://svn.gna.org/viewcvs/relax/branches/xyz/generic_fns/ pcs.py?rev=13946&r1=13945&r2=13946&view=diff 

Modified: branches/xyz/generic_fns/pipes.py
URL: http://svn.gna.org/viewcvs/relax/branches/xyz/generic_fns/ pipes.py?rev=13946&r1=13945&r2=13946&view=diff 

Modified: branches/xyz/generic_fns/relax_data.py
URL: http://svn.gna.org/viewcvs/relax/branches/xyz/generic_fns/ relax_data.py?rev=13946&r1=13945&r2=13946&view=diff 

Modified: branches/xyz/generic_fns/sequence.py
URL: http://svn.gna.org/viewcvs/relax/branches/xyz/generic_fns/ sequence.py?rev=13946&r1=13945&r2=13946&view=diff 

Modified: branches/xyz/generic_fns/spectrum.py
URL: http://svn.gna.org/viewcvs/relax/branches/xyz/generic_fns/ spectrum.py?rev=13946&r1=13945&r2=13946&view=diff 

Modified: branches/xyz/generic_fns/structure/geometric.py
URL: http://svn.gna.org/viewcvs/relax/branches/xyz/generic_fns/ structure/geometric.py?rev=13946&r1=13945&r2=13946&view=diff 

Modified: branches/xyz/generic_fns/structure/internal.py
URL: http://svn.gna.org/viewcvs/relax/branches/xyz/generic_fns/ structure/internal.py?rev=13946&r1=13945&r2=13946&view=diff 

Modified: branches/xyz/generic_fns/structure/main.py
URL: http://svn.gna.org/viewcvs/relax/branches/xyz/generic_fns/ structure/main.py?rev=13946&r1=13945&r2=13946&view=diff 

Modified: branches/xyz/generic_fns/value.py
URL: http://svn.gna.org/viewcvs/relax/branches/xyz/generic_fns/ value.py?rev=13946&r1=13945&r2=13946&view=diff 

Modified: branches/xyz/gui/analyses/auto_model_free.py
URL: http://svn.gna.org/viewcvs/relax/branches/xyz/gui/analyses/ auto_model_free.py?rev=13946&r1=13945&r2=13946&view=diff 

Modified: branches/xyz/gui/analyses/auto_noe.py
URL: http://svn.gna.org/viewcvs/relax/branches/xyz/gui/analyses/ auto_noe.py?rev=13946&r1=13945&r2=13946&view=diff 

Modified: branches/xyz/gui/analyses/auto_rx_base.py
URL: http://svn.gna.org/viewcvs/relax/branches/xyz/gui/analyses/ auto_rx_base.py?rev=13946&r1=13945&r2=13946&view=diff 

Modified: branches/xyz/gui/analyses/base.py
URL: http://svn.gna.org/viewcvs/relax/branches/xyz/gui/analyses/ base.py?rev=13946&r1=13945&r2=13946&view=diff 

Modified: branches/xyz/gui/analyses/results.py
URL: http://svn.gna.org/viewcvs/relax/branches/xyz/gui/analyses/ results.py?rev=13946&r1=13945&r2=13946&view=diff 

Modified: branches/xyz/gui/components/spectrum.py
URL: http://svn.gna.org/viewcvs/relax/branches/xyz/gui/components/ spectrum.py?rev=13946&r1=13945&r2=13946&view=diff 

Modified: branches/xyz/gui/menu.py
URL: http://svn.gna.org/viewcvs/relax/branches/xyz/gui/menu.py? rev=13946&r1=13945&r2=13946&view=diff 

Modified: branches/xyz/gui/misc.py
URL: http://svn.gna.org/viewcvs/relax/branches/xyz/gui/misc.py? rev=13946&r1=13945&r2=13946&view=diff 

Modified: branches/xyz/gui/paths.py
URL: http://svn.gna.org/viewcvs/relax/branches/xyz/gui/paths.py? rev=13946&r1=13945&r2=13946&view=diff 

Modified: branches/xyz/gui/relax_gui.py
URL: http://svn.gna.org/viewcvs/relax/branches/xyz/gui/relax_gui.py? rev=13946&r1=13945&r2=13946&view=diff 

Modified: branches/xyz/gui/settings.py
URL: http://svn.gna.org/viewcvs/relax/branches/xyz/gui/settings.py? rev=13946&r1=13945&r2=13946&view=diff 

Modified: branches/xyz/gui/user_functions/spin.py
URL: http://svn.gna.org/viewcvs/relax/branches/xyz/gui/ user_functions/spin.py?rev=13946&r1=13945&r2=13946&view=diff 

Modified: branches/xyz/prompt/relax_data.py
URL: http://svn.gna.org/viewcvs/relax/branches/xyz/prompt/ relax_data.py?rev=13946&r1=13945&r2=13946&view=diff 

Modified: branches/xyz/prompt/structure.py
URL: http://svn.gna.org/viewcvs/relax/branches/xyz/prompt/ structure.py?rev=13946&r1=13945&r2=13946&view=diff 

Modified: branches/xyz/prompt/value.py
URL: http://svn.gna.org/viewcvs/relax/branches/xyz/prompt/value.py? rev=13946&r1=13945&r2=13946&view=diff 

Modified: branches/xyz/relax_io.py
URL: http://svn.gna.org/viewcvs/relax/branches/xyz/relax_io.py? rev=13946&r1=13945&r2=13946&view=diff 

Modified: branches/xyz/sample_scripts/generate_ri.py
URL: http://svn.gna.org/viewcvs/relax/branches/xyz/sample_scripts/ generate_ri.py?rev=13946&r1=13945&r2=13946&view=diff
Modified: branches/xyz/sample_scripts/n_state_model/ conformation_analysis_rdc+pcs.py URL: http://svn.gna.org/viewcvs/relax/branches/xyz/sample_scripts/ n_state_model/conformation_analysis_rdc%2Bpcs.py? rev=13946&r1=13945&r2=13946&view=diff 

Modified: branches/xyz/specific_fns/api_base.py
URL: http://svn.gna.org/viewcvs/relax/branches/xyz/specific_fns/ api_base.py?rev=13946&r1=13945&r2=13946&view=diff 

Modified: branches/xyz/specific_fns/api_common.py
URL: http://svn.gna.org/viewcvs/relax/branches/xyz/specific_fns/ api_common.py?rev=13946&r1=13945&r2=13946&view=diff 

Modified: branches/xyz/specific_fns/consistency_tests.py
URL: http://svn.gna.org/viewcvs/relax/branches/xyz/specific_fns/ consistency_tests.py?rev=13946&r1=13945&r2=13946&view=diff 

Modified: branches/xyz/specific_fns/jw_mapping.py
URL: http://svn.gna.org/viewcvs/relax/branches/xyz/specific_fns/ jw_mapping.py?rev=13946&r1=13945&r2=13946&view=diff 

Modified: branches/xyz/specific_fns/model_free/main.py
URL: http://svn.gna.org/viewcvs/relax/branches/xyz/specific_fns/ model_free/main.py?rev=13946&r1=13945&r2=13946&view=diff 

Modified: branches/xyz/specific_fns/relax_fit.py
URL: http://svn.gna.org/viewcvs/relax/branches/xyz/specific_fns/ relax_fit.py?rev=13946&r1=13945&r2=13946&view=diff 

Modified: branches/xyz/specific_fns/setup.py
URL: http://svn.gna.org/viewcvs/relax/branches/xyz/specific_fns/ setup.py?rev=13946&r1=13945&r2=13946&view=diff
Modified: branches/xyz/test_suite/shared_data/align_data/ population_model/generate.py URL: http://svn.gna.org/viewcvs/relax/branches/xyz/test_suite/ shared_data/align_data/population_model/generate.py? rev=13946&r1=13945&r2=13946&view=diff 

Modified: branches/xyz/test_suite/system_tests/model_free.py
URL: http://svn.gna.org/viewcvs/relax/branches/xyz/test_suite/ system_tests/model_free.py?rev=13946&r1=13945&r2=13946&view=diff 

Modified: branches/xyz/test_suite/system_tests/relax_fit.py
URL: http://svn.gna.org/viewcvs/relax/branches/xyz/test_suite/ system_tests/relax_fit.py?rev=13946&r1=13945&r2=13946&view=diff
Modified: branches/xyz/test_suite/system_tests/scripts/ n_state_model/lactose_n_state.py URL: http://svn.gna.org/viewcvs/relax/branches/xyz/test_suite/ system_tests/scripts/n_state_model/lactose_n_state.py? rev=13946&r1=13945&r2=13946&view=diff
Modified: branches/xyz/test_suite/system_tests/scripts/ n_state_model/missing_data_test.py URL: http://svn.gna.org/viewcvs/relax/branches/xyz/test_suite/ system_tests/scripts/n_state_model/missing_data_test.py? rev=13946&r1=13945&r2=13946&view=diff
Modified: branches/xyz/test_suite/system_tests/scripts/ n_state_model/populations.py URL: http://svn.gna.org/viewcvs/relax/branches/xyz/test_suite/ system_tests/scripts/n_state_model/populations.py? rev=13946&r1=13945&r2=13946&view=diff
Modified: branches/xyz/test_suite/system_tests/scripts/ n_state_model/vector_loading.py URL: http://svn.gna.org/viewcvs/relax/branches/xyz/test_suite/ system_tests/scripts/n_state_model/vector_loading.py? rev=13946&r1=13945&r2=13946&view=diff 

Modified: branches/xyz/test_suite/system_tests/scripts/relax_fit.py
URL: http://svn.gna.org/viewcvs/relax/branches/xyz/test_suite/ system_tests/scripts/relax_fit.py? rev=13946&r1=13945&r2=13946&view=diff 

Modified: branches/xyz/test_suite/system_tests/structure.py
URL: http://svn.gna.org/viewcvs/relax/branches/xyz/test_suite/ system_tests/structure.py?rev=13946&r1=13945&r2=13946&view=diff 


_______________________________________________
relax (http://nmr-relax.com)

This is the relax-commits mailing list
[email protected]

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
[email protected]

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

Reply via email to