arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-08-01 03:47:23 +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/windows/dist/gcc-arm-none-eabi-4.4.1-2010q1-188-win32.tar.gz.sha vendored
View File

@ -1 +0,0 @@
f288affa058bfdd44f8b93800fc4cb01b2ebf1e5

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

@ -0,0 +1 @@
c41fa509205b9ced43fc221b6a0cae4223a0842d