rooty/Arduino
1
0
Fork 0
mirror of https://github.com/arduino/Arduino.git synced 2024-12-12 23:08:52 +01:00
Code Issues Releases Activity
1,391 Commits 7 Branches 93 Tags 2.9 GiB
f2bd8a5394
Commit Graph

21 Commits

Author SHA1 Message Date
Zach Eveland
f2bd8a5394 Merge branch 'new-extension' of github.com:arduino/Arduino into diskloader_reboot 
Conflicts:
	hardware/arduino/variants/mega/pins_arduino.h
	libraries/Ethernet/examples/PachubeClient/PachubeClient.ino
	libraries/Ethernet/examples/PachubeClientString/PachubeClientString.ino
 2011-10-27 11:41:02 -04:00
Zach Eveland
df9835efaf Merge branch 'master' of github.com:arduino/Arduino into diskloader_reboot 
Conflicts:
	app/src/processing/app/Editor.java
	app/src/processing/app/Sketch.java
	build/shared/examples/4.Communication/SerialCallResponse/SerialCallResponse.pde
	build/shared/lib/theme/theme.txt
	hardware/arduino/cores/arduino/HardwareSerial.h
	hardware/arduino/cores/arduino/Print.cpp
	hardware/arduino/cores/arduino/WString.h
	hardware/arduino/variants/mega/pins_arduino.h
	libraries/Ethernet/examples/PachubeClient/PachubeClient.ino
	libraries/Ethernet/examples/PachubeClientString/PachubeClientString.ino
	libraries/Firmata/examples/EchoString/EchoString.ino
	libraries/SD/File.cpp
	libraries/SoftwareSerial/SoftwareSerial.cpp
	libraries/SoftwareSerial/SoftwareSerial.h
	libraries/SoftwareSerial/examples/SoftwareSerialExample/SoftwareSerialExample.ino
	libraries/SoftwareSerial/keywords.txt
 2011-10-27 09:32:27 -04:00
David A. Mellis
6a68361a14 Updating Mac Info.plist version to 1.0-rc2. 2011-10-25 22:50:57 -04:00
David A. Mellis
98777c6b87 Updating Mac OS X version to 1.0-rc1. 2011-09-16 20:55:12 -04:00
David A. Mellis
1627fd39dc Updating Mac OS X Info.plist (.app) version to 1.0-beta4. 2011-09-09 17:16:28 -04:00
David A. Mellis
9dcf769123 Updating Mac OS X Info.plist version to 1.0-beta3. 2011-09-04 20:18:05 -04:00
David A. Mellis
3f0b7f21c2 Updating Mac OS X .app version to 1.0-beta2. 2011-08-26 13:34:25 -04:00
David A. Mellis
43cfc87f17 Updating version number to 0100 to allow checking for Arduino 1.0. 
http://code.google.com/p/arduino/issues/detail?id=453
 2011-03-26 16:41:30 -04:00
David A. Mellis
896b1a48a1 Revert "Merge branch 'new-extension' of git@github.com:arduino/Arduino" 
This reverts commit 42fa932ceb, reversing
changes made to a7352b894f.

See: http://www.kernel.org/pub/software/scm/git/docs/howto/revert-a-faulty-merge.txt for information on how to merge the branch in later.
 2011-02-25 18:23:34 -05:00
David A. Mellis
3e31777fec Merge branch 'master' into new-extension 2010-12-17 09:12:36 -05:00
David A. Mellis
37e6e7e86b Changing version number to 0022. 2010-11-28 14:16:10 -06:00
David A. Mellis
43092293ec New document icons for new file extension. 2010-11-09 12:31:53 -05:00
David A. Mellis
1240b5d911 Associating .ino, .c, .cpp, .h (but not .pde or .java) with Arduino on Mac OS X. 2010-11-06 16:00:02 -04:00
David A. Mellis
fa4d058297 Reapplying Christian's regex patch. 
Revert "Revert "Removed dependencies from regex library oro.jar""

This reverts commit ed7795ef8d.
 2010-10-03 19:44:28 -04:00
David A. Mellis
4c26e071c8 Updating version to 0021. 2010-10-02 14:03:50 -04:00
David A. Mellis
ed7795ef8d Revert "Removed dependencies from regex library oro.jar" 
This reverts commit 2b4391052c.
 2010-10-02 17:19:53 +02:00
Cristian Maglie
2b4391052c Removed dependencies from regex library oro.jar 2010-10-01 19:41:36 +02:00
David A. Mellis
5c22a1e970 Updating version to 0020. 2010-09-24 16:29:07 -04:00
David A. Mellis
66f671b6a8 Updating application icon for Mac OS X and Windows. (Windows one is untested.) 2010-09-22 09:08:09 -04:00
David A. Mellis
e131b36894 Adding version number to Mac Info.plist so it appears in the finder. 2010-08-15 20:11:02 +00:00
David A. Mellis
c4760d8ae7 Moving to ant-based build system from Processing. Mac OS X seems to work (for the moment). 2010-05-08 21:47:19 +00:00