OSDN Git Service

Merge branch 'master' of http://exfat.googlecode.com/svn/trunk/ into lollipop-x86 lollipop-x86
authorChih-Wei Huang <cwhuang@linux.org.tw>
Fri, 21 Aug 2015 12:39:31 +0000 (20:39 +0800)
committerChih-Wei Huang <cwhuang@linux.org.tw>
Fri, 21 Aug 2015 12:39:31 +0000 (20:39 +0800)
commit96fa796cf9321b629f785ce73f70dab886990f16
treef1e500cbc3a75dad0e75fd9c4ad519cde165ee55
parentdf499ea5e3447b0a3126d0b2bbea6e5b81e4de66
parent44bdd75574d108b146cc22508c4713b63d3f24ed
Merge branch 'master' of exfat.googlecode.com/svn/trunk/ into lollipop-x86

Conflicts:
mkfs/cbm.c
13 files changed:
fsck/main.c
fuse/main.c
libexfat/compiler.h
libexfat/exfat.h
libexfat/io.c
libexfat/log.c
libexfat/platform.h
mkfs/cbm.c
mkfs/fat.c
mkfs/main.c
mkfs/mkexfat.c
mkfs/rootdir.c
mkfs/vbr.c