diff options
| author | Cristian Maglie <c.maglie@bug.st> | 2011-12-22 00:35:33 +0100 |
|---|---|---|
| committer | Cristian Maglie <c.maglie@bug.st> | 2011-12-22 00:35:33 +0100 |
| commit | a382d32a16daa7f04635f2fae02a8d12fb7f22e6 (patch) | |
| tree | eef103b9c47676a64f6ff3d4ba6e0c04a227a1c1 /bootloaders/stk500v2/STK500V2.pnproj | |
| parent | a9d1368e4c424f17d7d77efeb666f2f7734c7b93 (diff) | |
| parent | f7039fe7ac1f5a2555d58c3c1e9601cd59b3b84a (diff) | |
Merge commit 'fcbbf8f4b4960bae1091c0cd9dc58b4a1885baf6' into platforms-b
Conflicts:
app/src/processing/app/Base.java
app/src/processing/app/debug/Compiler.java
build/build.xml
hardware/arduino/boards.txt
Diffstat (limited to 'bootloaders/stk500v2/STK500V2.pnproj')
0 files changed, 0 insertions, 0 deletions