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 'ide-1.5.x' into dev-ide-1.5.x-discovery

Browse Source 
Conflicts:
	app/src/processing/app/Preferences.java
	app/src/processing/app/debug/Uploader.java
This commit is contained in:
Cristian Maglie
2013-08-23 15:59:24 +02:00
parent a205ceb9f7 56316ea581
commit ea8c14421a
840 changed files with 170908 additions and 18320 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
build/macosx/dist/gcc-arm-none-eabi-4.4.1-2010q1-188-macos.tar.gz.sha vendored
View File

@ -1 +0,0 @@
14c554bb9aa9f0d0262a593e7452d33f4babc60d

1
build/macosx/dist/gcc-arm-none-eabi-4.7.4-2013q2-mac.tar.gz.sha vendored Normal file
View File

@ -0,0 +1 @@
a1326c6258f91d9b318570bc619ca8a3b799d8bc