Skip to content

Commit e3d629d

Browse files
committed
Merge remote-tracking branch 'arduino/master'
2 parents abe05b9 + cc3a1e7 commit e3d629d

11 files changed

+7
-6
lines changed

build/arduino-builder-linux32-1.0.0-beta17.tar.bz2.sha

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
116be2d595f2e43209e21f0a5f432fd923638e4f

build/arduino-builder-linux64-1.0.0-beta17.tar.bz2.sha

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
e9471f83306b879d12f333ef7cb408bb17ee3086

build/arduino-builder-macosx-1.0.0-beta17.tar.bz2.sha

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
d01731e19c439b4df3909310c83c9a8d3d92de60

build/arduino-builder-windows-1.0.0-beta17.zip.sha

Lines changed: 0 additions & 1 deletion
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
6115d2a304e96148d0da5d59aeed545cdb79455e

build/build.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@
7171
</or>
7272
</condition>
7373

74-
<property name="ARDUINO-BUILDER-VERSION" value="1.0.0-beta17" />
74+
<property name="ARDUINO-BUILDER-VERSION" value="1.0.0-beta18" />
7575

7676
<!-- Libraries required for running arduino -->
7777
<fileset dir=".." id="runtime.jars">

build/shared/revisions.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ ARDUINO 1.6.6
2121
* Introducing arduino-builder, a command line tool that properly calls gcc. Fixes lots of issues about buggy preprocessing.
2222
* Each open sketch gets built in its own folder, allowing the IDE to recycle previous compilations and being much faster
2323
* "Go to line": CTRL+L or Edit > Go to line... will open a dialog where you can type the line number where you want the editor to jump to
24+
* Added boards.local.txt support: like platform.local.txt, allows to enrich a boards.txt definition without modifying the original file. Thanks @Wackerbarth
2425

2526
[libraries]
2627
* Bridge: YunClient.connected() returns true if there are bytes available for read. Thanks @RobAtticus

hardware/arduino/sam/libraries/Wire/library.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ author=Arduino
44
maintainer=Arduino <[email protected]>
55
sentence=Allows the communication between devices or sensors connected via Two Wire Interface Bus. For Arduino DUE only.
66
paragraph=
7-
cateogry=Communication
7+
category=Communication
88
url=http://www.arduino.cc/en/Reference/Wire
99
architectures=sam
1010

0 commit comments

Comments
 (0)