]> Chaos Git - corbenik/ctrulib.git/commit
Merge branch 'master' into great-refactor
authorfincs <fincs.alt1@gmail.com>
Sun, 4 Oct 2015 15:37:19 +0000 (17:37 +0200)
committerfincs <fincs.alt1@gmail.com>
Sun, 4 Oct 2015 15:37:19 +0000 (17:37 +0200)
commitb481e6a4466855ded7f677bb1a95af9c97b91652
treee7982dd64fb93d05e06d08e817975e77a2e36201
parent8e052004d518a62a3b429e384c10d09792cd6775
parent41c35375f5dbb5a567d8a2849bd2a448387cb323
Merge branch 'master' into great-refactor

Conflicts:
libctru/include/3ds/services/hid.h
libctru/include/3ds/services/irrst.h
libctru/include/3ds/mappable.h
libctru/include/3ds/services/hid.h
libctru/include/3ds/services/irrst.h
libctru/source/gfx.c
libctru/source/services/csnd.c
libctru/source/services/hid.c
libctru/source/services/irrst.c