From 37ec3f13f4abb4ddd8763f1cc916b4a1d62890a2 Mon Sep 17 00:00:00 2001
From: William S Fulton <wsf@fultondesigns.co.uk>
Date: Mon, 13 Feb 2017 20:39:16 +0000
Subject: [PATCH] Merge matlab .ignore file into the one and only .gitignore
 file

---
 .gitignore                            | 9 ++++-----
 Examples/test-suite/matlab/.gitignore | 4 ----
 2 files changed, 4 insertions(+), 9 deletions(-)
 delete mode 100644 Examples/test-suite/matlab/.gitignore

diff --git a/.gitignore b/.gitignore
index e4724d53dcf..652e1276b4f 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 dd28fc5413f..00000000000
--- a/Examples/test-suite/matlab/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-# files generated by the test-suite
-*setup.m
-*wrap.cxx
-*wrap.h