Skip to content

Commit

Permalink
Merge 1.6.1 into esp8266
Browse files Browse the repository at this point in the history
* commit 'b8b2869753d488bfd203615637e1de3912589a92': (68 commits)
  Updated revisions.txt
  Fixed wrong path in successful message
  arduino-core: restored debug info in class files
  Fixed NPE in case of missing boardData
  Added missing translations
  Added windows drivers
  Added warning for uncertified boards
  Update revision.txt
  update revisions.txt
  SoftwareSerial: match bool API with HardwareSerial
  Fix to save as to parent folder is needed by all OSs, not just Mac
  Update revision.txt
  MacOSX: previous better IDE was missing some pieces. Added
  MacOSX: better IDE
  Updated revisions.txt
  NEW button now behaves as clicking File -> New menu entry. Fixes esp8266#2685
  Windows: bundled JRE updated to 8u31 build.xml now uses unzip target
  Added .getParentFile() to saveas for mac. This prevents saving into the sketch itself
  Compound edits weren't part of the undo/redo dance
  An undoable action marks the sketh as modified
  ...
  • Loading branch information
igrr committed Mar 27, 2015
1 parent cfda6cb commit 27d450d
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 4 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ build/macosx/libastylej*
build/macosx/appbundler*.jar
build/macosx/appbundler*.zip
build/macosx/appbundler
build/macosx/appbundler-1.0ea-arduino2
build/linux/work/
build/linux/dist/*.tar.gz
build/linux/dist/*.tar.bz2
Expand Down
5 changes: 3 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,11 @@ board and a development environment that implements the Processing/Wiring
language. Arduino can be used to develop stand-alone interactive objects or
can be connected to software on your computer (e.g. Flash, Processing, MaxMSP).
The boards can be assembled by hand or purchased preassembled; the open-source
IDE can be downloaded for free.
IDE can be downloaded for free at http://arduino.cc/en/Main/Software

* For more information, see the website at: http://www.arduino.cc/
or the forums at: http://arduino.cc/forum/
or the forums at: http://arduino.cc/forum/
You can also follow Arduino on twitter at: https://twitter.com/arduino or like Arduino on Facebook at: https://www.facebook.com/official.arduino

* To report a *bug* in the software or to request *a simple enhancement* go to:
http://github.com/arduino/Arduino/issues
Expand Down
4 changes: 2 additions & 2 deletions libraries/SD/library.properties
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name=SD
version=1.0
author=
maintainer=
author=Arduino, SparkFun
maintainer=Arduino <[email protected]>
sentence=Enables reading and writing on SD cards. For all Arduino boards.
paragraph=Once an SD memory card is connected to the SPI interfare of the Arduino board you are enabled to create files and read/write on them. You can also move through directories on the SD card.
category=Data Storage
Expand Down

0 comments on commit 27d450d

Please sign in to comment.