Changeset aba7b40 in sasview for .gitignore


Ignore:
Timestamp:
Feb 19, 2015 9:05:49 AM (10 years ago)
Author:
smk78
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:
6271222
Parents:
850c753 (diff), 96032b3 (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

File:
1 edited

Legend:

Unmodified
Added
Removed

  • .gitignore

    raeb018d ra97c51e  
    1212.project 
    1313.pydevproject 
     14.vagrant 
    1415build 
    1516dist 
    … …  
    2021html 
    2122build 
    22  
     23sasview-install 
    2324docs/sphinx-docs 
    2425 
Note: See TracChangeset for help on using the changeset viewer.