Merge branch 'master' into matthijskooijman-ide-1.5.x-timer-variant

Conflicts:
	app/src/processing/app/debug/Compiler.java
	hardware/arduino/sam/cores/arduino/main.cpp

Author: cmaglie

build/shared/revisions.txt

@@ -42,6 +42,7 @@ The following changes are included also in the (not yet released) Arduino IDE 1.
 * avr: Improved USB-CDC read code (Paul Brook)
 * avr: Fixed race condition in USB-CDC transmit (Paul Brook)
 * Fixed wrong NULL pointer handling in Stream class (Amulya Kumar Sahoo)
+* Added initVariant() hook to allow 3rd party variant-specific initialization
 
 [ide]
 * Fix toolchain command line to compile assembler files (Jimmy Hedman)
@@ -302,6 +303,7 @@ ARDUINO 1.0.6 - not yet released
 * Backported String class from IDE 1.5.x (Matt Jenkins)
 * Backported Print class from IDE 1.5.x
 * Backported digitalPinToInterrupt macro from IDE 1.5.x
+* Added initVariant() hook to allow 3rd party variant-specific initialization
 
 [ide]
 * Added compatibility for IDE 1.5.x libraries layout

hardware/arduino/sam/cores/arduino/main.cpp

@@ -31,13 +31,20 @@ extern void SysTick_Handler( void )
 }
 */
 
+// Weak empty variant initialization function.
+// May be redefined by variant files.
+void initVariant() __attribute__((weak));
+void initVariant() { }
+
 /*
  * \brief Main entry point of Arduino application
  */
 int main( void )
 {
 	init();
 
+	initVariant();
+
 	delay(1);
 
 #if defined(USBCON)

hardware/arduino/sam/cores/arduino/wiring.h

@@ -26,6 +26,7 @@ extern "C" {
 /**
  *
  */
+extern void initVariant( void ) ;
 extern void init( void ) ;
 
 /**