arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-06-22 08:22:04 +03:00
Code Activity

update AVR src

Browse Source 
* java code not tested *

Merge remote-tracking branch 'remotes/arduino/master' into esp8266

Conflicts:
	README.md
	app/src/processing/app/AbstractMonitor.java
	arduino-core/src/processing/app/Serial.java
	libraries/WiFi/examples/WiFiWebClientRepeating/WiFiWebClientRepeating.ino
	libraries/WiFi/library.properties
This commit is contained in:
Markus Sattler
2015-06-17 14:22:59 +02:00
parent d8e22e3ca7 5b2ef53045
commit f206d31581
390 changed files with 5510 additions and 12573 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build/linux/dist/appdata.xml vendored
View File

@ -19,6 +19,6 @@
<screenshot type="default" width="624" height="351">http://mavit.fedorapeople.org/appdata/arduino-screenshot.png</screenshot>
<screenshot width="704" height="396">http://mavit.fedorapeople.org/appdata/arduino-photo.jpg</screenshot>
</screenshots>
<url type="homepage">http://arduino.cc/</url>
<url type="homepage">http://www.arduino.cc/</url>
<updatecontact>arduino.appdata.xml@mavit.org.uk</updatecontact>
</application>

8
build/linux/dist/arduino vendored
View File

@ -1,4 +1,4 @@
#!/bin/bash
#!/usr/bin/env bash
CURDIR=`pwd`
APPDIR="$(dirname -- "$(readlink -f -- "${0}")" )"
@ -28,5 +28,9 @@ fi
export JAVA_TOOL_OPTIONS=`echo $JAVA_TOOL_OPTIONS | sed 's|-javaagent:/usr/share/java/jayatanaag.jar||g'`
java -Dswing.defaultlaf=com.sun.java.swing.plaf.gtk.GTKLookAndFeel $SPLASH processing.app.Base --curdir $CURDIR "$@"
JAVA=java
if [ -x ./java/bin/java ]; then
JAVA=./java/bin/java
fi
$JAVA -Dswing.defaultlaf=com.sun.java.swing.plaf.gtk.GTKLookAndFeel $SPLASH processing.app.Base --curdir "$CURDIR" "$@"

2
build/linux/dist/install.sh vendored
View File

@ -13,5 +13,5 @@ rm arduino.desktop-bak
cp arduino.desktop ~/.local/share/applications/arduino.desktop
cp arduino.desktop ~/Desktop/arduino.desktop
echo "Instaled Arduino IDE icons on menu and desktop !"
echo "Installed Arduino IDE icons on menu and desktop !"