diff options
| author | Oliver Buchtala <oliver.buchtala@googlemail.com> | 2014-03-05 01:09:26 +0100 |
|---|---|---|
| committer | Oliver Buchtala <oliver.buchtala@googlemail.com> | 2014-03-05 01:09:26 +0100 |
| commit | a234542543088140e4dd925b0060a93960db9eee (patch) | |
| tree | 952d2818d50027d150b5388dc121e99ef95316e5 /.gitignore | |
| parent | 8c05fe37afcbcd6a2fc2a7d8bbe028e6d8f59239 (diff) | |
| parent | c99417ab136ed643c437065c88368b67b4e77fa3 (diff) | |
| download | swig-a234542543088140e4dd925b0060a93960db9eee.tar.gz | |
Merge branch 'master' into tmp
Conflicts:
.travis.yml
Examples/Makefile.in
Examples/test-suite/director_nspace.i
Examples/test-suite/nspace.i
Examples/test-suite/nspace_extend.i
Source/Modules/lang.cxx
configure.ac
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore index 25cac8fec..8d72cea5d 100644 --- a/.gitignore +++ b/.gitignore @@ -3,7 +3,7 @@ *.class # Editor files and various other junk -*.sw? +.*.sw? *.bak *.log .DS_Store @@ -70,7 +70,6 @@ Examples/Makefile Examples/guile/Makefile Examples/test-suite/*/Makefile Examples/xml/Makefile -Lib/ocaml/swigp4.ml /Makefile Source/Include/stamp-h1 Source/Include/swigconfig.h |