Changeset ee563d5 in sasview for .gitignore


Ignore:
Timestamp:
Oct 7, 2016 9:11:15 AM (8 years ago)
Author:
Mathieu Doucet <doucetm@…>
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, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload
Children:
61780e3
Parents:
9b6d62d (diff), 5dd7499 (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

  • .gitignore

    rdf332d8 r5dd7499  
    4141 
    4242/docs/sphinx-docs/build 
     43/docs/sphinx-docs/source-temp 
    4344/docs/sphinx-docs/source/dev/api 
    4445/docs/sphinx-docs/source/user/guiframe 
    4546/docs/sphinx-docs/source/user/models 
    4647/docs/sphinx-docs/source/user/perspectives 
     48/docs/sphinx-docs/source/user/sasgui 
     49 
    4750 
    4851# test outputs 
Note: See TracChangeset for help on using the changeset viewer.