Commit Graph

4 Commits

Author SHA1 Message Date
Zach Eveland 8a35793794 Merge branch 'master' of github.com:arduino/Arduino into LUFA_bootloader
Conflicts:
	.gitignore
2012-03-03 13:28:39 -05:00
David A. Mellis a4a00c98cf Ignoring some local Xcode files. 2012-03-02 17:47:57 -05:00
Zach Eveland 98b0491fbd superficial changes to stock LUFA CDC bootloader - renamed project, removed unnecessary files 2012-01-19 20:31:35 -05:00
David A. Mellis 0797b618ec Adding .gitignore to ignore (some) generated binaries. 2012-01-04 15:50:11 -05:00