]> Chaos Git - corbenik/ctrulib.git/commit
Merge branch 'master' into great-refactor
authorfincs <fincs.alt1@gmail.com>
Sat, 3 Oct 2015 16:46:04 +0000 (18:46 +0200)
committerfincs <fincs.alt1@gmail.com>
Sat, 3 Oct 2015 16:46:04 +0000 (18:46 +0200)
commit8e052004d518a62a3b429e384c10d09792cd6775
treec45b6a1759a238bb21008bf56b1f99c907ff75fd
parent167f27cdc4a71af5b0a3e42f0f7d0b09af396625
parent5c7273ef3b545e8a11484cb96c4bd0d6785d22cd
Merge branch 'master' into great-refactor

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