OSDN Git Service

(root) / android-x86 / external-exfat.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 80f80c9 82764a7)
Merge branch 'master' of git://github.com/relan/exfat into marshmallow-x86 android-x86-6.0-r1 android-x86-6.0-r2
authorChih-Wei Huang <cwhuang@linux.org.tw>
Wed, 6 Jul 2016 19:02:09 +0000 (03:02 +0800)
committerChih-Wei Huang <cwhuang@linux.org.tw>
Wed, 6 Jul 2016 19:05:37 +0000 (03:05 +0800)
commit94181f2bcfc21a5e53e1c37f1610de2b48080155
tree6af40bfc68ba9e6154938e2e038baf53ae334981tree | snapshot
parent80f80c96fe8e604639ef091ca0613eb7f788fc12commit | diff
parent82764a7a8cdfa778efbffd59fdc7a15726ff50f4commit | diff
Merge branch 'master' of git://github.com/relan/exfat into marshmallow-x86

Conflicts:
libexfat/io.c
12 files changed:
libexfat/android_config.h diff1 | | blob | history
libexfat/compiler.h diff1 | diff2 | blob | history
libexfat/exfat.h diff1 | diff2 | blob | history
libexfat/io.c diff1 | diff2 | blob | history
libexfat/log.c diff1 | diff2 | blob | history
libexfat/lookup.c diff1 | diff2 | blob | history
libexfat/node.c diff1 | diff2 | blob | history
libexfat/platform.h diff1 | diff2 | blob | history
libexfat/utf.h diff1 | diff2 | blob | history
libexfat/utils.c diff1 | diff2 | blob | history
mkfs/main.c diff1 | diff2 | blob | history
mkfs/rootdir.c diff1 | diff2 | blob | history
external/exfat
About OSDN
Find Software
Develop Software
Help