]> Chaos Git - corbenik/ctrulib.git/commit
Merge branch 'master' into great-refactor
authorfincs <fincs.alt1@gmail.com>
Sat, 3 Oct 2015 10:39:09 +0000 (12:39 +0200)
committerfincs <fincs.alt1@gmail.com>
Sat, 3 Oct 2015 10:39:09 +0000 (12:39 +0200)
commit8912773f212428587487f7e8d34b9498af13f6a2
tree2b9d92e7a73bff095063627858dfc21db6e4026c
parent89e0bcd8cc321128a3a3c3d2508d92ffef86ad5b
parentc765e3b559f1b38012e3fd4e98d3d450f64aba3d
Merge branch 'master' into great-refactor

Conflicts:
libctru/include/3ds/services/apt.h
libctru/include/3ds/services/fs.h
libctru/source/services/apt.c
libctru/include/3ds/services/apt.h
libctru/include/3ds/services/fs.h
libctru/source/services/apt.c
libctru/source/services/fs.c