arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-10-12 12:44:53 +03:00
Code Activity

Merge branch 'new-extension' of github.com:arduino/Arduino into diskloader_reboot

Browse Source 
Conflicts:
	hardware/arduino/variants/mega/pins_arduino.h
	libraries/Ethernet/examples/PachubeClient/PachubeClient.ino
	libraries/Ethernet/examples/PachubeClientString/PachubeClientString.ino
This commit is contained in:
Zach Eveland
2011-10-27 11:41:02 -04:00
parent 03e1515a51 432fab12db
commit f2bd8a5394
14 changed files with 212 additions and 226 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7,11 +7,11 @@
<!-- all these need to change for new releases -->
<key>CFBundleGetInfoString</key>
<string>1.0-rc1</string>
<string>1.0-rc2</string>
<key>CFBundleVersion</key>
<string>0100</string>
<key>CFBundleShortVersionString</key>
<string>1.0-rc1</string>
<string>1.0-rc2</string>
<!-- now stop changing things and get outta here -->
<key>CFBundleAllowMixedLocalizations</key>