]> Chaos Git - corbenik/ctrulib.git/commit
Merge branch 'master' into great-refactor
authorfincs <fincs.alt1@gmail.com>
Sun, 1 Nov 2015 13:14:01 +0000 (14:14 +0100)
committerfincs <fincs.alt1@gmail.com>
Sun, 1 Nov 2015 13:14:01 +0000 (14:14 +0100)
commite4775572c25ec9765e854c54e9feb44f8e742b7e
treed0bb1e490a2b743034569e341b83ffca11510fe8
parent7914b4110729911dc5dea7005571c45c75acd953
parent6b40ea9d8edbc90a81441e3284382c6a499f3190
Merge branch 'master' into great-refactor

# Conflicts:
# libctru/include/3ds/services/httpc.h
libctru/Makefile
libctru/source/services/httpc.c