Merge branch 'gdbstub' into wii-network

Conflicts:
	Source/Core/Core/Src/ConfigManager.cpp
This commit is contained in:
Matthew Parlane
2013-01-08 21:21:05 +13:00
12 changed files with 1066 additions and 10 deletions

View File

@ -44,6 +44,7 @@ enum LOG_TYPE {
DVDINTERFACE,
DYNA_REC,
EXPANSIONINTERFACE,
GDB_STUB,
POWERPC,
GPFIFO,
OSHLE,