arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-06-16 11:21:18 +03:00
Code Activity

Merged 1.0.2

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

Conflicts:
	app/src/processing/app/debug/AvrdudeUploader.java
	build/shared/examples/09.USB/Keyboard/KeyboardLogout/KeyboardLogout.ino
	build/shared/examples/09.USB/Keyboard/KeyboardReprogram/KeyboardReprogram.ino
	build/shared/examples/09.USB/Keyboard/KeyboardSerial/KeyboardSerial.ino
	build/shared/examples/09.USB/Mouse/ButtonMouseControl/ButtonMouseControl.ino
	build/shared/examples/09.USB/Mouse/JoystickMouseControl/JoystickMouseControl.ino
	hardware/arduino/boards.txt
This commit is contained in:
Cristian Maglie
2012-11-04 22:49:14 +01:00
parent d5e7d0dabd 056ba5fca0
commit 23c7536dc7
22 changed files with 3583 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
build/linux/dist/arduino vendored
View File

@ -1,8 +1,8 @@
#!/bin/sh
APPDIR="$(dirname -- $(readlink -f -- "${0}") )"
APPDIR="$(dirname -- "$(readlink -f -- "${0}")" )"
cd $APPDIR
cd "$APPDIR"
for LIB in \
java/lib/rt.jar \
@ -19,4 +19,4 @@ export LD_LIBRARY_PATH
export PATH="${APPDIR}/java/bin:${PATH}"
java -Dswing.defaultlaf=com.sun.java.swing.plaf.gtk.GTKLookAndFeel processing.app.Base
java -Dswing.defaultlaf=com.sun.java.swing.plaf.gtk.GTKLookAndFeel processing.app.Base "$@"