Changeset 5dfbb24 in sasview for .gitignore


Ignore:
Timestamp:
May 20, 2016 8:37:27 PM (9 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:
7c752d0e
Parents:
26d6e045 (diff), 230178b (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

  • .gitignore

    r02098e3 re04f87b  
    5151/test/sasdataloader/test/test_log.txt 
    5252 
     53# autogenerated scripts 
     54/sasview/installer.iss 
     55 
Note: See TracChangeset for help on using the changeset viewer.