Shawn Hoffman f7423a0a4f Merge branch 'master' into wxw3-update ... Conflicts: Source/Core/DolphinWX/Src/LogWindow.cpp		2012-03-22 17:57:38 -07:00
..
Base.props
CodeGen_Debug.props
CodeGen_DebugFast.props
CodeGen_Release.props
Dolphin.Win32.props
Dolphin.x64.props
PrecompiledHeader.props
WXWOverrides.props