Merge remote-tracking branch 'arduino/ide-1.5.x' into ide-1.5.x

This commit is contained in:
Cristian Maglie 2015-01-06 15:24:17 +01:00
commit 0dbd35a70e
1 changed files with 6 additions and 3 deletions

9
.gitignore vendored
View File

@ -15,15 +15,18 @@ hardware/arduino/bootloaders/caterina_LUFA/Caterina.eep
hardware/arduino/bootloaders/caterina_LUFA/.dep/
build/libastylej-*.zip
build/windows/work/
build/windows/jre.zip
build/windows/*.zip
build/windows/*.tgz
build/windows/libastylej*
build/windows/arduino-*.zip
build/windows/dist/gcc-*.tar.gz
build/windows/dist/*.tar.gz
build/windows/dist/*.tar.bz2
build/windows/launch4j-*
build/windows/launcher/launch4j
build/windows/WinAVR-*.zip
build/macosx/arduino-*.zip
build/macosx/dist/gcc-*.tar.gz
build/macosx/dist/*.tar.gz
build/macosx/dist/*.tar.bz2
build/macosx/libastylej*
build/macosx/appbundler*.jar
build/linux/work/