Merge branch 'master' of https://github.com/arduino-org/ArduinoExt

sergiotomasello · sergiotomasello · commit a9b585f0a36c · 2015-07-03T11:43:30.000+02:00
diff --git a/.gitignore b/.gitignore
@@ -26,3 +26,6 @@ build/Release
 # https://www.npmjs.org/doc/misc/npm-faq.html#should-i-check-my-node_modules-folder-into-git
 node_modules/
 *.idea
+
+# tools dir
+hardware/tools
diff --git a/main.js b/main.js
@@ -163,4 +163,4 @@ define(function (require, exports, module) {
         $('#toolbar-console-btn').addClass('consolehover');
     });
 
-});
+});
diff --git a/modules/Toolbar/main.js b/modules/Toolbar/main.js
@@ -103,4 +103,4 @@ define(function (require, exports, module) {
                 //console.log(btnid+' clicked');
         }
     }
-});
+});
diff --git a/package.json b/package.json
@@ -3,6 +3,6 @@
   "title": "Arduino",
   "description": "Arduino brackets extension",
   "homepage": "http://arduino.org",
-  "version": "0.0.1",
+  "version": "0.0.2",
   "author": "Arduino.org Team <support@arduino.org>"
-}
+}

-Original file line number
+Diff line change
         $('#toolbar-console-btn').addClass('consolehover');
     });
 -});
 +});
Original file line number	Diff line number	Diff line change
`@@ -103,4 +103,4 @@ define(function (require, exports, module) {`
`103`	`103`	`//console.log(btnid+' clicked');`
`104`	`104`	`}`
`105`	`105`	`}`
`106`		`-});`
	`106`	`+});`