Changeset 66b63ee in sasview for sasview


Ignore:
Timestamp:
Feb 18, 2015 1:39:21 AM (9 years ago)
Author:
Peter Parker
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:
b9fc674
Parents:
464f182a (diff), d838715 (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

Location:
sasview
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • sasview/installer.iss

    r3a39c2e r25f223b  
    3131Root: HKCR;     Subkey: ".asc\OpenWithList\SasView.exe";         Flags: uninsdeletekey noerror 
    3232Root: HKCR;     Subkey: ".dat\OpenWithList\SasView.exe";         Flags: uninsdeletekey noerror 
    33 Root: HKCR;     Subkey: ".tif\OpenWithList\SasView.exe";         Flags: uninsdeletekey noerror 
    3433Root: HKCR;     Subkey: ".abs\OpenWithList\SasView.exe";         Flags: uninsdeletekey noerror 
    3534Root: HKCR;     Subkey: ".d1d\OpenWithList\SasView.exe";         Flags: uninsdeletekey noerror 
    36 Root: HKCR;     Subkey: ".sas\OpenWithList\SasView.exe";         Flags: uninsdeletekey noerror 
     35Root: HKCR;     Subkey: ".sans\OpenWithList\SasView.exe";        Flags: uninsdeletekey noerror 
    3736Root: HKCR;     Subkey: ".nxs\OpenWithList\SasView.exe";         Flags: uninsdeletekey noerror 
    3837Root: HKCR; Subkey: "applications\SasView.exe\shell\open\command";      ValueType: string; ValueName: "";       ValueData: """{app}\SasView.exe""  ""%1""";      Flags: uninsdeletevalue noerror 
    … …  
    4140Root: HKCU;     Subkey: "Software\Classes\.asc\OpenWithList\SasView.exe";        Flags: uninsdeletekey noerror 
    4241Root: HKCU;     Subkey: "Software\Classes\.dat\OpenWithList\SasView.exe";        Flags: uninsdeletekey noerror 
    43 Root: HKCU;     Subkey: "Software\Classes\.tif\OpenWithList\SasView.exe";        Flags: uninsdeletekey noerror 
    4442Root: HKCU;     Subkey: "Software\Classes\.abs\OpenWithList\SasView.exe";        Flags: uninsdeletekey noerror 
    4543Root: HKCU;     Subkey: "Software\Classes\.d1d\OpenWithList\SasView.exe";        Flags: uninsdeletekey noerror 
    46 Root: HKCU;     Subkey: "Software\Classes\.sas\OpenWithList\SasView.exe";        Flags: uninsdeletekey noerror 
     44Root: HKCU;     Subkey: "Software\Classes\.sans\OpenWithList\SasView.exe";       Flags: uninsdeletekey noerror 
    4745Root: HKCU;     Subkey: "Software\Classes\.nxs\OpenWithList\SasView.exe";        Flags: uninsdeletekey noerror 
    4846Root: HKCU; Subkey: "Software\Classes\applications\SasView.exe\shell\open\command";     ValueType: string; ValueName: "";       ValueData: """{app}\SasView.exe""  ""%1""";      Flags: uninsdeletevalue noerror 

  • sasview/setup_exe.py

    r464f182a r66b63ee  
    308308packages = [ 
    309309    'matplotlib', 'scipy', 'encodings', 'comtypes', 
    310     'win32com', 'ho.pisa', 'bumps', 
     310    'win32com', 'xhtml2pdf', 'bumps', 
    311311    ] 
    312312packages.extend([ 
Note: See TracChangeset for help on using the changeset viewer.