Changeset 3c61df4 in sasview


Ignore:
Timestamp:
Sep 12, 2016 1:00:01 AM (5 years ago)
Author:
Paul Kienzle <pkienzle@…>
Branches:
master, ESS_GUI, ESS_GUI_Docs, ESS_GUI_batch_fitting, ESS_GUI_bumps_abstraction, ESS_GUI_iss1116, ESS_GUI_iss879, ESS_GUI_iss959, ESS_GUI_opencl, ESS_GUI_ordering, ESS_GUI_sync_sascalc, costrafo411, magnetic_scatt, release-4.1.1, release-4.1.2, release-4.2.2, release_4.0.1, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload
Children:
af00478
Parents:
05829fb (diff), fd0d6b46 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'master' of github.com:sasview/sasview

Conflicts:

src/sas/sasgui/perspectives/fitting/media/fitting_help.rst

File:
1 edited

Legend:

Unmodified
Added
Removed
  • src/sas/sasgui/perspectives/fitting/media/fitting_help.rst

    rfd0d6b46 r05829fb  
    216216.. ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ 
    217217 
    218   .. _Writing_a_Plugin: 
    219  
    220   Writing a Plugin 
    221   ---------------- 
    222  
    223   Advanced users can write their own model in Python and save it to the the SasView 
    224   *plugin_models* folder 
    225  
    226     *C:\\Users\\[username]\\.sasview\\plugin_models* - (on Windows) 
    227  
    228   in .py format. The next time SasView is started it will compile the plugin and add 
    229   it to the list of *Customized Models*. 
    230  
    231   It is recommended that existing plugin models be used as templates. 
    232  
    233 .. ZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZZ 
    234  
    235218.. _Fitting_Options: 
    236219 
Note: See TracChangeset for help on using the changeset viewer.