Changeset fa6a8d1 in sasview for src/sas/dataloader


Ignore:
Timestamp:
Feb 19, 2015 8:13:24 AM (10 years ago)
Author:
krzywon
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:
74d679d, 80c84b5
Parents:
4749514 (diff), 98f6916 (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 ​https://github.com/SasView/sasview/

File:
1 edited

Legend:

Unmodified
Added
Removed

  • src/sas/dataloader/loader.py

    r5e326a6 r4749514  
    363363        :return: DataInfo object 
    364364        """ 
    365         print self.__registry.extensions 
    366365        return self.__registry.load(file, format) 
    367366     
Note: See TracChangeset for help on using the changeset viewer.