Information for dolphin-qt-4.0-595

Version
4.0-595
Branch
dolphin-qt
Date
9 years, 3 months ago
Mac OS X Android
Commit
9a127be60d719059cd1c4227535425e96b27b0b6
Change author
waddlesplash
Change description 
Merge master into dolphin-qt

Conflicts:
	CMakeLists.txt
	Source/Core/DolphinWX/Src/Frame.cpp
	Source/Dolphin_2010.sln [deleted]