personal
Merge branch 'master' of https://github.com/dolphin-emu/dolphin
updated frametools.cpp
Merge branch 'master' of github.com:kamiyo/dolphin

Conflicts:
	Source/Core/DolphinWX/FrameTools.cpp