Changeset dba8557 in sasview for .gitignore


Ignore:
Timestamp:
Sep 23, 2017 3:37:35 PM (7 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, magnetic_scatt, release-4.2.2, ticket-1009, ticket-1094-headless, ticket-1242-2d-resolution, ticket-1243, ticket-1249, ticket885, unittest-saveload
Children:
fca1f50, 66000ae
Parents:
948484f (diff), 53b8266 (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 'ticket-869' into ticket-887-reorg

File:
1 edited

Legend:

Unmodified
Added
Removed

  • .gitignore

    re9df8a5 r948484f  
    1010# Feel free to add more stuff to this as and when it becomes an issue. 
    1111 
     12# Editor files 
    1213.DS_Store 
    13 .project 
    14 .pydevproject 
    15 .vagrant 
    16 .idea 
    17 .settings/ 
    18 build 
    19 dist 
     14/.settings 
     15/.vscode 
     16/.project 
     17/.pydevproject 
     18/.idea 
     19 
     20# Build and run files 
     21**/__pycache__ 
     22*.pyc 
     23*.so 
     24/.vagrant 
     25/build 
     26/dist 
    2027sasview.egg-info 
    21 sasview.egg-info 
    22  
    2328.mplconfig 
    24 doctrees 
    25 html 
    26 build 
    27  
     29default_categories.json 
    2830/setup.cfg 
    2931 
    30 /dist 
    31 **/build 
    32 sasview.egg-info 
    33 sasview-install 
    34 **/test/logs 
    35 *.pyc 
    36 *.so 
    37 default_categories.json 
    38  
    39 /src/sas/models/*.py 
    40 /src/sas/models/c_extension/c_models/c_models.cpp 
    41 /src/sas/models/c_extension/python_wrapper/generated/ 
    42 /src/sas/models/media/.idea/ 
    43  
     32# doc build 
    4433/docs/sphinx-docs/build 
    4534/docs/sphinx-docs/source-temp 
    … …  
    4736/docs/sphinx-docs/source/user/guiframe 
    4837/docs/sphinx-docs/source/user/models 
     38/docs/sphinx-docs/source/user/sasview 
    4939/docs/sphinx-docs/source/user/perspectives 
    50 /docs/sphinx-docs/source/user/sasgui 
    5140/docs/sphinx-docs/katex*.zip 
    52  
     41/docs/sphinx-docs/node_modules 
     42/docs/sphinx-docs/node-package.json 
    5343 
    5444# test outputs 
    … …  
    6050/test/sasdataloader/test/write_test.xml 
    6151/test/fileconverter/test/export2d.h5 
    62 test*log 
     52**/test/logs 
     53tests.log 
    6354 
    64 # autogenerated scripts 
    65 /sasview/installer.iss 
    66  
    67 # Editor files 
    68 .vscode/ 
    69  
     55# Installer files 
     56/sasview-install 
     57/installers/installer.iss 
     58/installers/build 
     59/installers/dist 
Note: See TracChangeset for help on using the changeset viewer.