From 2fdb4c12557466c192fef72fea7e3b4af2cfad1c Mon Sep 17 00:00:00 2001
From: ansuz <ansuz@transitiontech.ca>
Date: Tue, 12 Apr 2016 15:07:31 +0200
Subject: [PATCH] ignore external files and anything relying on es6

merge differences from netflux

Conflicts:
	.jshintignore
---
 .jshintignore | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/.jshintignore b/.jshintignore
index 29b53f0f4..3780e2719 100644
--- a/.jshintignore
+++ b/.jshintignore
@@ -1,6 +1,6 @@
 node_modules/
 www/bower_components/
-www/code/codemirror-5.7/
+www/code/codemirror*
 www/code/mode/
 www/code/codemirror.js
 www/pad/rangy.js
@@ -12,3 +12,14 @@ storage/kad.js
 www/common/otaml.js
 www/common/diffDOM.js
 www/common/netflux.js
+
+www/padrtc
+www/common/netflux-client.js
+www/common/es6-promise.min.js
+www/_pad
+
+NetFluxWebsocketSrv.js
+NetFluxWebsocketServer.js
+WebRTCSrv.js
+
+www/assert/hyperscript.js