Merge remote-tracking branch 'upstream/master'

* upstream/master:
  Compile with -x assembler-with-cpp instead of -assembler-with-cpp.
  Signed drivers for Windows 8.1
  Updated revisions log
  Updated drivers signature for Windows

Author: oriregev

app/src/processing/app/debug/Compiler.java

@@ -547,7 +547,7 @@ static private List getCommandCompilerS(String avrBasePath, List includePaths,
       avrBasePath + "avr-gcc",
       "-c", // compile, don't link
       "-g", // include debugging info (so errors include line numbers)
-      "-assembler-with-cpp",
+      "-x","assembler-with-cpp",
       "-mmcu=" + boardPreferences.get("build.mcu"),
       "-DF_CPU=" + boardPreferences.get("build.f_cpu"),      
       "-DARDUINO=" + Base.REVISION,

build/shared/revisions.txt

@@ -1,4 +1,11 @@
 
+ARDUINO 1.0.5-r2 - 2014.01.08
+
+* Signed drivers for Windows 8.1
+* Fixed Windows drivers signature (that prevented installation on
+  some Windows 8.x OS). Now the signature is timestamped and should
+  not expire.
+
 ARDUINO 1.0.5 - 2013.05.15
 
 [core]

build/windows/dist/drivers/arduino.cat

@@ -26,6 +26,8 @@ robotControl.bootloader.name="Arduino Robot Control bootloader"
 robotControl.sketch.name="Arduino Robot"
 robotMotor.bootloader.name="Arduino Robot Motor bootloader"
 robotMotor.sketch.name="Arduino Robot"
+yun.bootloader.name="Arduino Yun bootloader"
+yun.sketch.name="Arduino Yun"
 
 [DefaultInstall]
 CopyINF=arduino.inf
@@ -37,7 +39,7 @@ Signature="$Windows NT$"
 Provider=%ManufacturerName%
 DriverPackageDisplayName=%DriverPackageDisplayName%
 CatalogFile=arduino.cat
-DriverVer=01/01/2013,1.0.0.0
+DriverVer=01/04/2013,1.0.0.0
 
 [Manufacturer]
 %ManufacturerName%=DeviceList, NTamd64, NTia64
@@ -69,6 +71,8 @@ DefaultDestDir=12
 %robotControl.sketch.name%=DriverInstall, USB\VID_2341&PID_8038&MI_00
 %robotMotor.bootloader.name%=DriverInstall, USB\VID_2341&PID_0039
 %robotMotor.sketch.name%=DriverInstall, USB\VID_2341&PID_8039&MI_00
+%yun.bootloader.name%=DriverInstall, USB\VID_2341&PID_0041
+%yun.sketch.name%=DriverInstall, USB\VID_2341&PID_8041&MI_00
 
 [DeviceList.NTamd64]
 %due.bossa.name%=DriverInstall, USB\VID_03EB&PID_6124
@@ -93,6 +97,8 @@ DefaultDestDir=12
 %robotControl.sketch.name%=DriverInstall, USB\VID_2341&PID_8038&MI_00
 %robotMotor.bootloader.name%=DriverInstall, USB\VID_2341&PID_0039
 %robotMotor.sketch.name%=DriverInstall, USB\VID_2341&PID_8039&MI_00
+%yun.bootloader.name%=DriverInstall, USB\VID_2341&PID_0041
+%yun.sketch.name%=DriverInstall, USB\VID_2341&PID_8041&MI_00
 
 [DeviceList.NTia64]
 %esplora.bootloader.name%=DriverInstall, USB\VID_2341&PID_003C
@@ -114,6 +120,8 @@ DefaultDestDir=12
 %robotControl.sketch.name%=DriverInstall, USB\VID_2341&PID_8038&MI_00
 %robotMotor.bootloader.name%=DriverInstall, USB\VID_2341&PID_0039
 %robotMotor.sketch.name%=DriverInstall, USB\VID_2341&PID_8039&MI_00
+%yun.bootloader.name%=DriverInstall, USB\VID_2341&PID_0041
+%yun.sketch.name%=DriverInstall, USB\VID_2341&PID_8041&MI_00
 
 [DriverInstall]
 include=mdmcpq.inf,usb.inf