Changeset c4a7660 in sasview for src


Ignore:
Timestamp:
Mar 31, 2015 4:49:11 PM (10 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:
415fb82
Parents:
c971c98 (diff), 4e080980 (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

File:
1 edited

Legend:

Unmodified
Added
Removed

  • src/sas/guiframe/gui_statusbar.py

    r1805b87 r4342107f  
    2222CONSOLE_WIDTH = 500 
    2323CONSOLE_HEIGHT = 300 
    24 FRAME_ICON = wx.Icon(GUIFRAME_ICON.FRAME_ICON_PATH,wx.BITMAP_TYPE_ICON) 
     24FRAME_ICON = wx.Icon(GUIFRAME_ICON.FRAME_ICON_PATH, wx.BITMAP_TYPE_ICO) 
    2525 
    2626if sys.platform.count("win32") > 0: 
Note: See TracChangeset for help on using the changeset viewer.