Merge branch 'master' into developer

This commit is contained in:
TuxSH 2016-08-25 21:22:32 +02:00
commit 76cee0d95b

View File

@ -50,8 +50,7 @@ FirmwareSource firmSource;
void main(void) void main(void)
{ {
bool isFirmlaunch, bool isA9lh;
isA9lh;
u32 newConfig, u32 newConfig,
emuHeader; emuHeader;