ArduinoCore-avr/libraries/Wire
Cristian Maglie ee90e68e86 Merged 1.0.5
Merge remote-tracking branch 'arduino/master' into ide-1.5.x

Conflicts:
	app/src/processing/app/Base.java
	build/shared/revisions.txt
	hardware/arduino/avr/cores/arduino/malloc.c
	hardware/arduino/cores/arduino/avr-libc/malloc.c
	hardware/arduino/cores/arduino/malloc.c
	todo.txt
2013-04-03 13:51:04 +02:00
..
examples fixed permissions on a lot of text files. see #1116 2012-12-10 10:42:49 +01:00
utility Merged 1.0.5 2013-04-03 13:51:04 +02:00
Wire.cpp fixed permissions on a lot of text files. see #1116 2012-12-10 10:42:49 +01:00
Wire.h fixed permissions on a lot of text files. see #1116 2012-12-10 10:42:49 +01:00
keywords.txt Moved libraries folder inside platform folder. Now libraries and examples are searched per board/platform 2012-01-04 15:14:51 +01:00