From 9f50313038b41d787f59c28137764e8d02057b01 Mon Sep 17 00:00:00 2001
From: Federico Fissore <f.fissore@arduino.cc>
Date: Mon, 6 Jul 2015 12:44:57 +0200
Subject: [PATCH] Upgraded libastyle to 2.05.1

---
 build/build.xml                 | 12 ++++++------
 build/libastylej-2.05.1.zip.sha |  1 +
 build/libastylej-2.05.zip.sha   |  1 -
 build/shared/lib/formatter.conf |  2 ++
 4 files changed, 9 insertions(+), 7 deletions(-)
 create mode 100644 build/libastylej-2.05.1.zip.sha
 delete mode 100644 build/libastylej-2.05.zip.sha

diff --git a/build/build.xml b/build/build.xml
index f2309c822..5c33daad9 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -364,8 +364,8 @@
     </antcall>
 
     <antcall target="unzip">
-      <param name="archive_file" value="./libastylej-2.05.zip" />
-      <param name="archive_url" value="http://downloads.arduino.cc/libastylej-2.05.zip" />
+      <param name="archive_file" value="./libastylej-2.05.1.zip" />
+      <param name="archive_url" value="http://downloads.arduino.cc/libastylej-2.05.1.zip" />
       <param name="final_folder" value="${staging_folder}/libastylej" />
       <param name="dest_folder" value="${staging_folder}" />
     </antcall>
@@ -538,8 +538,8 @@
     <chmod perm="755" file="linux/work/arduino" />
 
     <antcall target="unzip">
-      <param name="archive_file" value="./libastylej-2.05.zip" />
-      <param name="archive_url" value="http://downloads.arduino.cc/libastylej-2.05.zip" />
+      <param name="archive_file" value="./libastylej-2.05.1.zip" />
+      <param name="archive_url" value="http://downloads.arduino.cc/libastylej-2.05.1.zip" />
       <param name="final_folder" value="${staging_folder}/libastylej" />
       <param name="dest_folder" value="${staging_folder}" />
     </antcall>
@@ -756,8 +756,8 @@
     <antcall target="windows-build-avr-toolchain" />
 
     <antcall target="unzip">
-      <param name="archive_file" value="./libastylej-2.05.zip" />
-      <param name="archive_url" value="http://downloads.arduino.cc/libastylej-2.05.zip" />
+      <param name="archive_file" value="./libastylej-2.05.1.zip" />
+      <param name="archive_url" value="http://downloads.arduino.cc/libastylej-2.05.1.zip" />
       <param name="final_folder" value="${staging_folder}/libastylej" />
       <param name="dest_folder" value="${staging_folder}" />
     </antcall>
diff --git a/build/libastylej-2.05.1.zip.sha b/build/libastylej-2.05.1.zip.sha
new file mode 100644
index 000000000..fb8096195
--- /dev/null
+++ b/build/libastylej-2.05.1.zip.sha
@@ -0,0 +1 @@
+328bdc3baf781193f3bc33a56fa477de67f5bfd8
diff --git a/build/libastylej-2.05.zip.sha b/build/libastylej-2.05.zip.sha
deleted file mode 100644
index 31be12552..000000000
--- a/build/libastylej-2.05.zip.sha
+++ /dev/null
@@ -1 +0,0 @@
-2cd093d3da2b0204a666d90440f513b717c9f80c
diff --git a/build/shared/lib/formatter.conf b/build/shared/lib/formatter.conf
index 255716d1d..bae28ba7b 100644
--- a/build/shared/lib/formatter.conf
+++ b/build/shared/lib/formatter.conf
@@ -5,6 +5,8 @@
 # Instead, copy it in the same folder of file "preferences.txt" and modify the copy. This way, you won't lose your custom formatter settings when upgrading the IDE
 # If you don't know where file preferences.txt is stored, open the IDE, File -> Preferences and you'll find a link
 
+mode=c
+
 # 2 spaces indentation
 indent=spaces=2