Changeset fdd3ba1 in sasview for sasview/sasview.py


Ignore:
Timestamp:
Aug 19, 2016 9:21:28 AM (8 years ago)
Author:
lewis
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, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload
Children:
c476457
Parents:
d3e1870 (diff), 4abcc93a (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' into file-converter

File:
1 edited

Legend:

Unmodified
Added
Removed

  • sasview/sasview.py

    r7f71637 rfdd3ba1  
    100100 
    101101from matplotlib import backend_bases 
    102 backend_bases._default_filetypes.pop('pgf', None) 
     102backend_bases.FigureCanvasBase.filetypes.pop('pgf', None) 
    103103 
    104104class SasView(): 
Note: See TracChangeset for help on using the changeset viewer.