summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam S Fulton <wsf@fultondesigns.co.uk>2017-02-13 20:39:16 +0000
committerWilliam S Fulton <wsf@fultondesigns.co.uk>2017-02-13 20:42:46 +0000
commit37ec3f13f4abb4ddd8763f1cc916b4a1d62890a2 (patch)
treeb391c2de6d763ab5228a63cfec4fd7454cf79118
parent0911c316cbd1f86ce4401017c7c35ca0b6fe23e2 (diff)
downloadswig-37ec3f13f4abb4ddd8763f1cc916b4a1d62890a2.tar.gz
Merge matlab .ignore file into the one and only .gitignore file
-rw-r--r--.gitignore9
-rw-r--r--Examples/test-suite/matlab/.gitignore4
2 files changed, 4 insertions, 9 deletions
diff --git a/.gitignore b/.gitignore
index e4724d53d..652e1276b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -156,11 +156,10 @@ Examples/test-suite/javascript/*/
# Matlab
*.mex*
-# module directories
-[+]*/
-# matlab common
-SwigRef.m
-SwigMem.m
+Examples/test-suite/matlab/[+]*/
+Examples/test-suite/matlab/*setup.m
+Examples/test-suite/matlab/SwigRef.m
+Examples/test-suite/matlab/SwigMem.m
# Octave
swigexample*.oct
diff --git a/Examples/test-suite/matlab/.gitignore b/Examples/test-suite/matlab/.gitignore
deleted file mode 100644
index dd28fc541..000000000
--- a/Examples/test-suite/matlab/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-# files generated by the test-suite
-*setup.m
-*wrap.cxx
-*wrap.h