Conflicts: .gitignore common.mk common/debug_config.h common/print.h |
||
|---|---|---|
| .. | ||
| bootloader.c | ||
| eeconfig.c | ||
| suspend.c | ||
| suspend_avr.h | ||
| timer.c | ||
| timer_avr.h | ||
| xprintf.S | ||
| xprintf.h | ||
Conflicts: .gitignore common.mk common/debug_config.h common/print.h |
||
|---|---|---|
| .. | ||
| bootloader.c | ||
| eeconfig.c | ||
| suspend.c | ||
| suspend_avr.h | ||
| timer.c | ||
| timer_avr.h | ||
| xprintf.S | ||
| xprintf.h | ||