]> Chaos Git - corbenik/ctrulib.git/commit
Merge branch 'master' into great-refactor
authorfincs <fincs.alt1@gmail.com>
Fri, 25 Sep 2015 14:16:10 +0000 (16:16 +0200)
committerfincs <fincs.alt1@gmail.com>
Fri, 25 Sep 2015 14:16:10 +0000 (16:16 +0200)
commit649e95cd39a1f3962eba6be8545023295002e8ce
tree2bb2df2fef8d740ff3bd6777a4a71baa479aa294
parentcd05ca08873ad91f074468e4bc04feccb3a0f7cc
parent2b467b48b877b8e4d7b39c871401871f10f95b7b
Merge branch 'master' into great-refactor

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