projects / pub / USBasp.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9864c02 9669a00)
Merge branch 'master' into dmbs
authorDean Camera <dean@fourwalledcubicle.com>
Sun, 3 Apr 2016 01:34:34 +0000 (11:34 +1000)
committerDean Camera <dean@fourwalledcubicle.com>
Sun, 3 Apr 2016 01:34:34 +0000 (11:34 +1000)
1  2 
LUFA/DoxygenPages/BuildSystem.txt patch | diff1 | diff2 | blob | history
Projects/XPLAINBridge/makefile patch | diff1 | diff2 | blob | history

diff --cc LUFA/DoxygenPages/BuildSystem.txt
Simple merge
diff --cc Projects/XPLAINBridge/makefile
Simple merge
USB isp AVR programmer