]> Chaos Git - corbenik/ctrulib.git/commit
Merge branch 'master' into great-refactor
authorfincs <fincs.alt1@gmail.com>
Thu, 19 Nov 2015 10:44:59 +0000 (11:44 +0100)
committerfincs <fincs.alt1@gmail.com>
Thu, 19 Nov 2015 10:44:59 +0000 (11:44 +0100)
commit3714fa3810f25572a3aa71208114d452d36bbb14
tree1c29f552b34ea146f9171e42a3ac545205137440
parent3fbea733c6abc0e0c24b0796a5c52b146aea9d3f
parent6a7f13654da6024c97a5f5792350f1181c173fa1
Merge branch 'master' into great-refactor

# Conflicts:
# libctru/include/3ds/services/fs.h
# libctru/source/os.c
# libctru/source/romfs_dev.c
# libctru/source/services/fs.c
libctru/include/3ds/os.h
libctru/source/os-versionbin.c