From: Robert Becker <robert@rbecker.eu>
Date: Fri, 5 Feb 2016 09:11:58 +0000 (+0100)
Subject: Chart.js was missing?
X-Git-Tag: v2.0.0~49^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=92bc1a04cf8b08d5b61459ac09d799659f2b359d;p=thirdparty%2FChart.js.git

Chart.js was missing?
---

diff --git a/nbproject/private/private.properties b/nbproject/private/private.properties
new file mode 100644
index 000000000..46d8315a1
--- /dev/null
+++ b/nbproject/private/private.properties
@@ -0,0 +1,2 @@
+auxiliary.org-netbeans-modules-javascript-karma.config=karma.conf.js
+browser=Chrome.INTEGRATED
diff --git a/nbproject/private/private.xml b/nbproject/private/private.xml
new file mode 100644
index 000000000..6807a2ba1
--- /dev/null
+++ b/nbproject/private/private.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project-private xmlns="http://www.netbeans.org/ns/project-private/1">
+    <editor-bookmarks xmlns="http://www.netbeans.org/ns/editor-bookmarks/2" lastBookmarkId="0"/>
+    <open-files xmlns="http://www.netbeans.org/ns/projectui-open-files/2">
+        <group/>
+    </open-files>
+</project-private>
diff --git a/nbproject/project.properties b/nbproject/project.properties
new file mode 100644
index 000000000..f1789b74d
--- /dev/null
+++ b/nbproject/project.properties
@@ -0,0 +1,21 @@
+auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.expand-tabs=true
+auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.indent-shift-width=4
+auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.spaces-per-tab=4
+auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.tab-size=4
+auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.text-limit-width=160
+auxiliary.org-netbeans-modules-editor-indent.CodeStyle.project.text-line-wrap=none
+auxiliary.org-netbeans-modules-editor-indent.CodeStyle.usedProfile=project
+auxiliary.org-netbeans-modules-editor-indent.text.javascript.CodeStyle.project.continuationIndentSize=4
+auxiliary.org-netbeans-modules-editor-indent.text.javascript.CodeStyle.project.expand-tabs=false
+auxiliary.org-netbeans-modules-editor-indent.text.javascript.CodeStyle.project.indent-shift-width=4
+auxiliary.org-netbeans-modules-editor-indent.text.javascript.CodeStyle.project.spaceBeforeAnonMethodDeclParen=false
+auxiliary.org-netbeans-modules-editor-indent.text.javascript.CodeStyle.project.spaces-per-tab=4
+auxiliary.org-netbeans-modules-editor-indent.text.javascript.CodeStyle.project.tab-size=4
+auxiliary.org-netbeans-modules-editor-indent.text.javascript.CodeStyle.project.text-limit-width=160
+auxiliary.org-netbeans-modules-editor-indent.text.javascript.CodeStyle.project.text-line-wrap=none
+auxiliary.org-netbeans-modules-javascript-gulp.action_2e_build=build
+file.reference.Chart.js-src=src
+file.reference.NetBeansProjects-Chart.js=.
+files.encoding=UTF-8
+site.root.folder=${file.reference.NetBeansProjects-Chart.js}
+source.folder=${file.reference.NetBeansProjects-Chart.js}
diff --git a/nbproject/project.xml b/nbproject/project.xml
new file mode 100644
index 000000000..6d060d0af
--- /dev/null
+++ b/nbproject/project.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://www.netbeans.org/ns/project/1">
+    <type>org.netbeans.modules.web.clientproject</type>
+    <configuration>
+        <data xmlns="http://www.netbeans.org/ns/clientside-project/1">
+            <name>Chart.js</name>
+        </data>
+    </configuration>
+</project>
diff --git a/package.json b/package.json
index c665c6901..6a5e523fe 100644
--- a/package.json
+++ b/package.json
@@ -10,7 +10,7 @@
   },
   "devDependencies": {
     "color": "git://github.com/chartjs/color",
-    "gulp": "3.5.x",
+    "gulp": "3.9.x",
     "gulp-concat": "~2.1.x",
     "gulp-connect": "~2.0.5",
     "gulp-html-validator": "^0.0.2",