Changeset d0e7052 in sasview


Ignore:
Timestamp:
Jul 25, 2016 1:33:03 AM (4 years ago)
Author:
butler
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:
7ffa826d
Parents:
b5c44f0 (diff), e19d29b (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.git

Files:
18 added
1 edited

Legend:

Unmodified
Added
Removed
  • src/sas/sasgui/guiframe/data_panel.py

    r1941e6a rb5c44f0  
    375375                             (self.sizer4), 
    376376                             ((10, 10)), 
    377                              (self.bt_help, 0, wx.EXPAND|wx.RIGHT, 5)]) 
     377                             (self.bt_help, 0, wx.RIGHT, 5)]) 
    378378 
    379379        self.sizer3.AddGrowableCol(1, 1) 
Note: See TracChangeset for help on using the changeset viewer.