Cristian Maglie 
							
						 
					 
					
						
						
							
						
						a0727ac862 
					 
					
						
						
							
							Merge branch 'master' into ide-1.5.x  
						
						 
						
						... 
						
						
						
						Conflicts:
	build/shared/examples/02.Digital/BlinkWithoutDelay/BlinkWithoutDelay.ino
	build/shared/examples/09.USB/Keyboard/KeyboardMessage/KeyboardMessage.ino
	libraries/LiquidCrystal/examples/CustomCharacter/CustomCharacter.ino
	libraries/SD/examples/listfiles/listfiles.ino 
						
						
					 
					
						2013-11-12 09:45:56 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Scott Fitzgerald 
							
						 
					 
					
						
						
							
						
						b79ee023de 
					 
					
						
						
							
							Updated KeyboardMessage example  
						
						 
						
						
						
						
					 
					
						2013-11-11 16:47:49 +04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Federico Fissore 
							
						 
					 
					
						
						
							
						
						b4c68b3dff 
					 
					
						
						
							
							Run new astyle formatter against all the examples  
						
						 
						
						
						
						
					 
					
						2013-10-21 09:58:40 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Cristian Maglie 
							
						 
					 
					
						
						
							
						
						a46259a0cf 
					 
					
						
						
							
							Merged 1.0.5  
						
						 
						
						... 
						
						
						
						Still missing:
- updates to WiFi lib for sam.
- updates to examples of Ehternet and WiFi for sam.
Merge remote-tracking branch 'arduino/master' into ide-1.5.x
Conflicts:
	app/src/processing/app/Base.java
	app/src/processing/app/Editor.java
	app/src/processing/app/helpers/FileUtils.java
	app/src/processing/app/i18n/Resources_fr.po
	app/src/processing/app/i18n/Resources_fr.properties
	build/shared/revisions.txt
	hardware/arduino/avr/libraries/Ethernet/examples/DnsWebClient/DnsWebClient.ino
	hardware/arduino/avr/libraries/WiFi/examples/WifiChatServer/WifiChatServer.ino
	hardware/arduino/avr/libraries/WiFi/examples/WifiPachubeClient/WifiPachubeClient.ino
	hardware/arduino/avr/libraries/WiFi/examples/WifiPachubeClientString/WifiPachubeClientString.ino
	hardware/arduino/avr/libraries/WiFi/examples/WifiTwitterClient/WifiTwitterClient.ino
	hardware/arduino/avr/libraries/WiFi/examples/WifiUdpSendReceiveString/WifiUdpSendReceiveString.ino
	hardware/arduino/avr/libraries/WiFi/examples/WifiWebClient/WifiWebClient.ino
	hardware/arduino/avr/libraries/WiFi/examples/WifiWebClientRepeating/WifiWebClientRepeating.ino
	hardware/arduino/avr/libraries/WiFi/examples/WifiWebServer/WifiWebServer.ino
	libraries/WiFi/examples/WiFiChatServer/WiFiChatServer.ino
	libraries/WiFi/examples/WiFiPachubeClient/WiFiPachubeClient.ino
	libraries/WiFi/examples/WiFiPachubeClientString/WiFiPachubeClientString.ino
	libraries/WiFi/examples/WiFiTwitterClient/WiFiTwitterClient.ino
	libraries/WiFi/examples/WiFiUdpSendReceiveString/WiFiUdpSendReceiveString.ino
	libraries/WiFi/examples/WiFiWebClient/WiFiWebClient.ino
	libraries/WiFi/examples/WiFiWebClientRepeating/WiFiWebClientRepeating.ino
	libraries/WiFi/examples/WiFiWebServer/WiFiWebServer.ino
	libraries/WiFi/examples/WifiChatServer/WifiChatServer.ino
	libraries/WiFi/examples/WifiPachubeClient/WifiPachubeClient.ino
	libraries/WiFi/examples/WifiPachubeClientString/WifiPachubeClientString.ino
	libraries/WiFi/examples/WifiTwitterClient/WifiTwitterClient.ino
	libraries/WiFi/examples/WifiUdpSendReceiveString/WifiUdpSendReceiveString.ino
	libraries/WiFi/examples/WifiWebClient/WifiWebClient.ino
	libraries/WiFi/examples/WifiWebClientRepeating/WifiWebClientRepeating.ino
	libraries/WiFi/examples/WifiWebServer/WifiWebServer.ino 
						
						
					 
					
						2013-05-11 14:37:25 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Fede85 
							
						 
					 
					
						
						
							
						
						0db906f175 
					 
					
						
						
							
							changed the pin where to connect the button from 2 to 4 to be compliant with the comment in the header and the tutorial.  
						
						 
						
						... 
						
						
						
						Fixes  #1396  
						
						
					 
					
						2013-04-30 17:55:34 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Cristian Maglie 
							
						 
					 
					
						
						
							
						
						23c7536dc7 
					 
					
						
						
							
							Merged 1.0.2  
						
						 
						
						... 
						
						
						
						Merge remote-tracking branch 'arduino/master' into ide-1.5.x
Conflicts:
	app/src/processing/app/debug/AvrdudeUploader.java
	build/shared/examples/09.USB/Keyboard/KeyboardLogout/KeyboardLogout.ino
	build/shared/examples/09.USB/Keyboard/KeyboardReprogram/KeyboardReprogram.ino
	build/shared/examples/09.USB/Keyboard/KeyboardSerial/KeyboardSerial.ino
	build/shared/examples/09.USB/Mouse/ButtonMouseControl/ButtonMouseControl.ino
	build/shared/examples/09.USB/Mouse/JoystickMouseControl/JoystickMouseControl.ino
	hardware/arduino/boards.txt 
						
						
					 
					
						2012-11-04 22:49:14 +01:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Scott 
							
						 
					 
					
						
						
							
						
						d6e9e03d13 
					 
					
						
						
							
							Changed Leonardo only examples to "USB", added  
						
						 
						
						
						
						
					 
					
						2012-10-31 16:08:20 -04:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Fede85 
							
						 
					 
					
						
						
							
						
						24d74ca8a2 
					 
					
						
						
							
							typos and Due compliants comments on Keyboard examples  
						
						 
						
						
						
						
					 
					
						2012-10-22 10:20:35 +02:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Scott 
							
						 
					 
					
						
						
							
						
						68e5047736 
					 
					
						
						
							
							Added keywords for new libraries, rearranged and modified Due and USB examples  
						
						 
						
						... 
						
						
						
						Renamed Leonardo Only examples folder to USB. Modified keyboard and
Mouse examples to indicate Due compatibility.
Minor modifications to Due examples to conform with existing example
sketches.
Added keywords to for Audio, Scheduer, and USBHost libraries. 
						
						
					 
					
						2012-10-21 12:36:54 -04:00