Matthew Parlane b6e054a2be Merge branch 'master' into wii-network
Conflicts:
	Source/Core/Core/Core.vcxproj
	Source/Core/Core/Core.vcxproj.filters
	Source/Core/Core/Src/CoreParameter.cpp
	Source/Core/DolphinWX/Dolphin.vcxproj
	Source/Core/DolphinWX/Dolphin.vcxproj.filters
2013-08-23 00:51:12 +12:00
..
2013-08-15 23:36:17 +12:00
2013-05-05 21:23:16 +02:00
2013-07-23 20:43:51 -04:00
2013-07-21 22:25:26 -04:00
2013-07-21 22:25:26 -04:00
2013-07-05 22:39:18 -04:00
2013-07-27 15:09:33 -05:00
2013-06-25 09:24:14 -04:00