Ryan Houdek 7bdd8191db Merge branch 'master' into android-new-control-input-overlay ... Conflicts: Source/Android/src/org/dolphinemu/dolphinemu/settings/video/VideoSettingsFragment.java		2013-11-29 21:27:17 -06:00
..
Android
Debugger
GLInterface
MemoryCards
AboutDolphin.cpp
AboutDolphin.h
ARCodeAddEdit.cpp
ARCodeAddEdit.h
CheatsWindow.cpp
CheatsWindow.h
ConfigMain.cpp
ConfigMain.h
FifoPlayerDlg.cpp
FifoPlayerDlg.h
Frame.cpp
Frame.h
FrameAui.cpp
FrameTools.cpp
GameListCtrl.cpp
GameListCtrl.h
GeckoCodeDiag.cpp
GeckoCodeDiag.h
GLInterface.h
Globals.h
HotkeyDlg.cpp
HotkeyDlg.h
InputConfigDiag.cpp
InputConfigDiag.h
InputConfigDiagBitmaps.cpp
ISOFile.cpp
ISOFile.h
ISOProperties.cpp
ISOProperties.h
LogConfigWindow.cpp
LogConfigWindow.h
LogWindow.cpp
LogWindow.h
Main.cpp
Main.h
MainAndroid.cpp
MainNoGUI.cpp
MemcardManager.cpp
MemcardManager.h
NetWindow.cpp
NetWindow.h
PatchAddEdit.cpp
PatchAddEdit.h
PHackSettings.cpp
PHackSettings.h
stdafx.cpp
stdafx.h
TASInputDlg.cpp
TASInputDlg.h
UDPConfigDiag.cpp
UDPConfigDiag.h
VideoConfigDiag.cpp
VideoConfigDiag.h
WiimoteConfigDiag.cpp
WiimoteConfigDiag.h
WXInputBase.cpp
WXInputBase.h
WxUtils.cpp
WxUtils.h
X11Utils.cpp
X11Utils.h