]> Chaos Git - corbenik/ctrulib.git/commitdiff
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)
# Conflicts:
# libctru/include/3ds/services/httpc.h

1  2 
libctru/Makefile
libctru/source/services/httpc.c

Simple merge
Simple merge