]> cloudbase.mooo.com Git - z180-stamp.git/commit
Merge branch 'chan-fatfs' into fatfs-integration
authorLeo C <erbl259-lmu@yahoo.de>
Sun, 27 May 2018 22:33:58 +0000 (00:33 +0200)
committerLeo C <erbl259-lmu@yahoo.de>
Sun, 27 May 2018 22:33:58 +0000 (00:33 +0200)
commit0f3b947bda5f34662a611272b9f12199e0da9aca
tree858d420b489f5b2fddefa5c3e4e094eb11687995
parentb4e3fab85fcd9f5b1502ec991c81302b910492d3
parentdbd0d34e68c73b9d3628cc1a1bda0b883976fc8b
Merge branch 'chan-fatfs' into fatfs-integration

# Conflicts:
# fatfs/source/diskio.h
# fatfs/source/integer.h
# fatfs/src/integer.h
# fatfs/src/option/ccsbcs.c
# include/avr/ffconf.h
# include/integer.h
fatfs/source/diskio.h.dist
fatfs/source/ffconf.h.dist
include/avr/ffconf.h