Changeset cd5e29b in sasview for .gitignore


Ignore:
Timestamp:
Sep 1, 2015 9:20:05 AM (7 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:
f0d720b
Parents:
40c5104 (diff), 600bea1 (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' into sasmodels-integration

File:
1 edited

Legend:

Unmodified
Added
Removed
  • .gitignore

    rdea7cb4 rcd5e29b  
    1212.project 
    1313.pydevproject 
     14.vagrant 
    1415.idea 
    1516build 
     
    1718sasview.egg-info 
    1819sasview.egg-info 
     20 
    1921.mplconfig 
    2022doctrees 
     
    2224build 
    2325 
    24 docs/sphinx-docs 
     26/dist 
     27**/build 
     28sasview.egg-info 
     29sasview-install 
     30**/test/logs 
     31*.pyc 
     32default_categories.json 
    2533 
    26 **/test/logs 
    27 **/build 
     34/src/sas/models/*.py 
     35/src/sas/models/c_extension/c_models/c_models.cpp 
     36/src/sas/models/c_extension/python_wrapper/generated/ 
     37/src/sas/models/media/.idea/ 
    2838 
    29 *.pyc 
    30  
    31 src/sas/models/*.py 
    32  
    33 src/sas/models/c_extension/c_models/c_models.cpp 
    34 src/sas/models/c_extension/python_wrapper/generated/ 
    35 src/sas/models/media/.idea/ 
     39/docs/sphinx-docs/build 
     40/docs/sphinx-docs/source/dev/api 
     41/docs/sphinx-docs/source/user/guiframe 
     42/docs/sphinx-docs/source/user/models 
     43/docs/sphinx-docs/source/user/perspectives 
    3644 
    3745default_categories.json 
Note: See TracChangeset for help on using the changeset viewer.