arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-07-30 16:24:09 +03:00
Code Activity

Merge branch 'master' of github.com:arduino/Arduino into diskloader_reboot

Browse Source 
Conflicts:
	app/src/processing/app/Editor.java
	app/src/processing/app/Sketch.java
	build/shared/examples/4.Communication/SerialCallResponse/SerialCallResponse.pde
	build/shared/lib/theme/theme.txt
	hardware/arduino/cores/arduino/HardwareSerial.h
	hardware/arduino/cores/arduino/Print.cpp
	hardware/arduino/cores/arduino/WString.h
	hardware/arduino/variants/mega/pins_arduino.h
	libraries/Ethernet/examples/PachubeClient/PachubeClient.ino
	libraries/Ethernet/examples/PachubeClientString/PachubeClientString.ino
	libraries/Firmata/examples/EchoString/EchoString.ino
	libraries/SD/File.cpp
	libraries/SoftwareSerial/SoftwareSerial.cpp
	libraries/SoftwareSerial/SoftwareSerial.h
	libraries/SoftwareSerial/examples/SoftwareSerialExample/SoftwareSerialExample.ino
	libraries/SoftwareSerial/keywords.txt
This commit is contained in:
Zach Eveland
2011-10-27 09:32:27 -04:00
parent ec45af8bfa f093cc6970
commit df9835efaf
42 changed files with 2415 additions and 1992 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
build/macosx/template.app/Contents/Info.plist
View File

@ -35,15 +35,13 @@
<dict>
<key>CFBundleTypeExtensions</key>
<array>
<string>ino</string>
<string>c</string>
<string>cpp</string>
<string>h</string>
<string>pde</string>
<string>java</string>
</array>
<key>CFBundleTypeIconFile</key>
<string>pde.icns</string>
<key>CFBundleTypeName</key>
<string>Arduino Source File</string>
<string>Processing Source File</string>
<key>CFBundleTypeMIMETypes</key>
<array>
<string>text/plain</string>

BIN
build/macosx/template.app/Contents/Resources/pde.icns
View File

Binary file not shown.