rooty/Arduino
1
0
Fork 0
mirror of https://github.com/arduino/Arduino.git synced 2025-02-26 20:54:22 +01:00
Code Issues Releases Activity

Merge branch 'ide-1.5.x-libastyle-2.05' of github.com:ffissore/Arduino into ide-1.5.x

Browse Source
This commit is contained in:
Cristian Maglie 2014-11-21 11:43:59 +01:00
commit 7b45b18ae8
4 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
build/build.xml
View File

@ -267,8 +267,8 @@
</delete> </delete>
<antcall target="unzip"> <antcall target="unzip">
<param name="archive_file" value="./libastylej-2.04.zip" /> <param name="archive_file" value="./libastylej-2.05.zip" />
<param name="archive_url" value="http://downloads.arduino.cc/libastylej-2.04.zip" /> <param name="archive_url" value="http://downloads.arduino.cc/libastylej-2.05.zip" />
<param name="final_folder" value="${staging_folder}/libastylej" /> <param name="final_folder" value="${staging_folder}/libastylej" />
<param name="dest_folder" value="${staging_folder}" /> <param name="dest_folder" value="${staging_folder}" />
</antcall> </antcall>
@ -486,8 +486,8 @@
<chmod perm="755" file="linux/work/arduino" /> <chmod perm="755" file="linux/work/arduino" />
<antcall target="unzip"> <antcall target="unzip">
<param name="archive_file" value="./libastylej-2.04.zip" /> <param name="archive_file" value="./libastylej-2.05.zip" />
<param name="archive_url" value="http://downloads.arduino.cc/libastylej-2.04.zip" /> <param name="archive_url" value="http://downloads.arduino.cc/libastylej-2.05.zip" />
<param name="final_folder" value="${staging_folder}/libastylej" /> <param name="final_folder" value="${staging_folder}/libastylej" />
<param name="dest_folder" value="${staging_folder}" /> <param name="dest_folder" value="${staging_folder}" />
</antcall> </antcall>
@ -715,8 +715,8 @@
</antcall> </antcall>
<antcall target="unzip"> <antcall target="unzip">
<param name="archive_file" value="./libastylej-2.04.zip" /> <param name="archive_file" value="./libastylej-2.05.zip" />
<param name="archive_url" value="http://downloads.arduino.cc/libastylej-2.04.zip" /> <param name="archive_url" value="http://downloads.arduino.cc/libastylej-2.05.zip" />
<param name="final_folder" value="${staging_folder}/libastylej" /> <param name="final_folder" value="${staging_folder}/libastylej" />
<param name="dest_folder" value="${staging_folder}" /> <param name="dest_folder" value="${staging_folder}" />
</antcall> </antcall>

1
build/libastylej-2.04.zip.sha
View File

@ -1 +0,0 @@
e62f8ff81296ca8bd46237e4254420394069d698

1
build/libastylej-2.05.zip.sha Normal file
View File

@ -0,0 +1 @@
2cd093d3da2b0204a666d90440f513b717c9f80c

2
build/shared/revisions.txt
View File

@ -15,6 +15,7 @@ ARDUINO 1.6.0rc1
* Improved avrdude verbose upload (Matthijs Kooijman) * Improved avrdude verbose upload (Matthijs Kooijman)
* (Mac OSX) Add Exported UTI for ino files, allows quick look to view the * (Mac OSX) Add Exported UTI for ino files, allows quick look to view the
content of the file and external editors to syntax highlight as C++ (Matt Lloyd) content of the file and external editors to syntax highlight as C++ (Matt Lloyd)
* Updated libastyle to 2.05
[core] [core]
* sam: added -MMD flag to let gcc produce dependency files (full rebuild on Arduino Due is now triggered only if needed) * sam: added -MMD flag to let gcc produce dependency files (full rebuild on Arduino Due is now triggered only if needed)
@ -23,6 +24,7 @@ ARDUINO 1.6.0rc1
* LiquidCrystal: added setRowOffsets function to support different LCD hardware configurations (Mark Sproul) * LiquidCrystal: added setRowOffsets function to support different LCD hardware configurations (Mark Sproul)
* LiquidCrystal: various improvements and optimizations (Matthijs Kooijman) * LiquidCrystal: various improvements and optimizations (Matthijs Kooijman)
* Fixed PROGMEM error in Robot_Control/examples/explore/R06_Wheel_Calibration * Fixed PROGMEM error in Robot_Control/examples/explore/R06_Wheel_Calibration
* SD: Fixed SPI transaction mismatch (Paul Stoffregen)
The following changes are included also in the Arduino IDE 1.0.7: The following changes are included also in the Arduino IDE 1.0.7: