Merge branch 'esp8266-esp8266' into esp8266

Author: ficeto

.gitignore

@@ -21,32 +21,36 @@ build/windows/libastylej*
 build/windows/arduino-*.zip
 build/windows/dist/*.tar.gz
 build/windows/dist/*.tar.bz2
-build/windows/launch4j-*
+build/windows/launch4j-*.tgz
+build/windows/launch4j-*.zip
 build/windows/launcher/launch4j
 build/windows/WinAVR-*.zip
 build/macosx/arduino-*.zip
 build/macosx/dist/*.tar.gz
 build/macosx/dist/*.tar.bz2
+build/macosx/*.tar.bz2
 build/macosx/libastylej*
 build/macosx/appbundler*.jar
 build/macosx/appbundler*.zip
 build/macosx/appbundler
 build/macosx/appbundler-1.0ea-arduino2
+build/macosx/appbundler-1.0ea-upstream1
 build/linux/work/
 build/linux/dist/*.tar.gz
 build/linux/dist/*.tar.bz2
 build/linux/*.tgz
+build/linux/*.tar.xz
+build/linux/*.tar.bz2
 build/linux/*.zip
 build/linux/libastylej*
 build/shared/reference*.zip
+build/shared/Edison*.zip
+build/shared/Galileo*.zip
 test-bin
 *.iml
 .idea
 .DS_Store
 .directory
-build/windows/launch4j-*
-build/windows/launcher/launch4j
-build/windows/WinAVR-*.zip
 hardware/arduino/avr/libraries/Bridge/examples/XivelyClient/passwords.h
 avr-toolchain-*.zip
 /hardware/tools/esp8266/utils/
@@ -57,6 +61,14 @@ avr-toolchain-*.zip
 /hardware/tools/bossac.exe
 /hardware/tools/listComPorts.exe
 
+/app/nbproject/private/
+/arduino-core/nbproject/private/
+/app/build/
+/arduino-core/build/
+
+manifest.mf
+nbbuild.xml
+nbproject
 build/macosx/esptool-*-osx.zip
 
 build/macosx/dist/osx-xtensa-lx106-elf.tgz

cores/esp8266/Arduino.h

@@ -38,7 +38,6 @@ extern "C" {
 #include "pgmspace.h"
 #include "esp8266_peri.h"
 #include "twi.h"
-  //#include "spiffs/spiffs.h"
 
 void yield(void);