From 8256cd2b939e69e1f88727ac3d0de419dab11675 Mon Sep 17 00:00:00 2001
From: Alberto Pettarin <alberto@albertopettarin.it>
Date: Thu, 27 Oct 2016 20:24:26 +0200
Subject: [PATCH] Minor edits per EI suggestion 3: moved local .gitignore into
 main .gitignore

---
 .gitignore            | 12 ++++++++++++
 emscripten/.gitignore |  9 ---------
 2 files changed, 12 insertions(+), 9 deletions(-)
 delete mode 100644 emscripten/.gitignore

diff --git a/.gitignore b/.gitignore
index 1e9681f2..61eca0dd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -99,6 +99,18 @@ License.txt
 ReadMe
 Makefile
 
+# emscripten files
+
+emscripten/*.out
+emscripten/*.pkl
+emscripten/espeakng_data_package.js
+emscripten/glue.*
+emscripten/js/*.js
+!emscripten/demo.html
+!emscripten/Makefile
+!emscripten/demo.js
+!emscripten/espeakng.js
+
 # espeak-ng-data
 
 dictsource/*_extra
diff --git a/emscripten/.gitignore b/emscripten/.gitignore
deleted file mode 100644
index 1a71483e..00000000
--- a/emscripten/.gitignore
+++ /dev/null
@@ -1,9 +0,0 @@
-*.o
-*.out
-*.pkl
-espeakng_data_package.js
-glue.*
-espeakng.worker.*
-pthread-main.js
-!demo.html
-!Makefile