Changeset 02098e3 in sasview for .gitignore


Ignore:
Timestamp:
Dec 8, 2015 11:09:13 AM (6 years ago)
Author:
ajj
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:
50a77df
Parents:
12e5cc8 (diff), 1c2bf90 (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:

merging master to integration branch. hopefully successfully this time and with no weird line ending issues

File:
1 edited

Legend:

Unmodified
Added
Removed
  • .gitignore

    rf0d720b r02098e3  
    2424build 
    2525 
     26/setup.cfg 
     27 
    2628/dist 
    2729**/build 
     
    3032**/test/logs 
    3133*.pyc 
     34*.so 
    3235default_categories.json 
    3336 
     
    4346/docs/sphinx-docs/source/user/perspectives 
    4447 
    45 default_categories.json 
     48# test outputs 
     49/test/pr_inversion/test/test_output.txt 
     50/test/sasdataloader/test/plugins.zip 
     51/test/sasdataloader/test/test_log.txt 
     52 
Note: See TracChangeset for help on using the changeset viewer.