]> Chaos Git - corbenik/ctrulib.git/commit
Merge branch 'master' into great-refactor
authorfincs <fincs.alt1@gmail.com>
Tue, 29 Sep 2015 21:21:45 +0000 (23:21 +0200)
committerfincs <fincs.alt1@gmail.com>
Tue, 29 Sep 2015 21:21:45 +0000 (23:21 +0200)
commit4603b972fa024efba0403d40850ab63c10543157
tree4cdb87a056ef91079f9427897bdd50d67cf71963
parentc9a75d6a182e8799f8f7cef036f0ecbfb9cce8c0
parent6590ed3fade7269f1f03ea9b914eb3e731f9c69f
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/svc.h
libctru/source/services/apt.c