]> Chaos Git - corbenik/ctrulib.git/commit
Merge branch 'master' of github.com:smealum/ctrulib
authorsmea <smealum@gmail.com>
Tue, 27 May 2014 18:49:50 +0000 (20:49 +0200)
committersmea <smealum@gmail.com>
Tue, 27 May 2014 18:49:50 +0000 (20:49 +0200)
commit4beea431842407fb18067314adac10d7b24cb221
treec5f284aeca7a10d3b3658d024d303c83107f4c9a
parent2aae159782c34a6fb14a9d864616ccd70c569358
parent3e69e498bb0db4bc975201604bc0dc59da560a22
Merge branch 'master' of github.com:smealum/ctrulib

Conflicts:
libctru/include/ctr/GSP.h
libctru/source/GSP.c
gpu/Makefile
libctru/include/ctr/GSP.h
libctru/source/GSP.c