]> Chaos Git - corbenik/ctrulib.git/commit
Merge branch 'master' into great-refactor
authorfincs <fincs.alt1@gmail.com>
Sat, 5 Sep 2015 20:14:34 +0000 (22:14 +0200)
committerfincs <fincs.alt1@gmail.com>
Sat, 5 Sep 2015 20:14:34 +0000 (22:14 +0200)
commit15af3eff305bba16b33962b723a1115346cec4af
tree7775e90d3eb3689e05905d38530d64e791ed0cb7
parent2707bfad93144494dfc51356b24b67c04de589ce
parent57eb921f1ada68100d587f1dfe55ff3760550f62
Merge branch 'master' into great-refactor

Conflicts:
libctru/source/gpu/gpu.c
libctru/include/3ds/gpu/gpu.h
libctru/source/gpu/gpu-old.c
libctru/source/gpu/gpu.c