]> Chaos Git - corbenik/ctrulib.git/commit
Merge branch 'master' into devop_socket
authorDave Murphy <davem@devkitpro.org>
Thu, 12 Feb 2015 15:52:15 +0000 (15:52 +0000)
committerDave Murphy <davem@devkitpro.org>
Thu, 12 Feb 2015 15:52:15 +0000 (15:52 +0000)
commit71a59a1da3464c33cb0a4057d1bbb3e76575c780
tree6ca13fd36b1e0b9b9c263b22c809e20703eef9a9
parentd08168b7d589fe6375de16783e7710cb7bed314a
parentdc7ef6fd2889a720c1ba98435a7b05c5e723364b
Merge branch 'master' into devop_socket

Conflicts:
libctru/source/services/soc/soc_ioctl.c
libctru/source/services/soc/soc_ioctl.c