dolphin/Source/Core/DolphinWX/Src
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 [Android-overlay] Add the new overlay icons. Support configuring them. Disable hardfloat since it has issues since Dalvik doesn't understand passing floats due to ABI differences. 2013-11-29 18:37:33 -06:00
Debugger Run code through the advanced tool 'sed' to remove trailing whitespace. 2013-11-03 20:54:05 -05:00
GLInterface Merge X11+D3D FreeLook feature into DolphinWX 2013-11-29 06:09:54 +01:00
MemoryCards Fix format string warnings 2013-11-13 04:01:16 +01:00
AboutDolphin.cpp Remove "educational purposes only" from about message. 2013-09-24 01:14:56 -04:00
AboutDolphin.h
ARCodeAddEdit.cpp Run code through the advanced tool 'sed' to remove trailing whitespace. 2013-11-03 20:54:05 -05:00
ARCodeAddEdit.h
CheatsWindow.cpp Run code through the advanced tool 'sed' to remove trailing whitespace. 2013-11-03 20:54:05 -05:00
CheatsWindow.h Support a gcm revision-specific game ini for cheats + partially fix gecko codes in default ini. 2013-09-28 23:38:25 -04:00
ConfigMain.cpp Run code through the advanced tool 'sed' to remove trailing whitespace. 2013-11-03 20:54:05 -05:00
ConfigMain.h Run code through the advanced tool 'sed' to remove trailing whitespace. 2013-11-03 20:54:05 -05:00
FifoPlayerDlg.cpp Run code through the advanced tool 'sed' to remove trailing whitespace. 2013-11-03 20:54:05 -05:00
FifoPlayerDlg.h Run code through the advanced tool 'sed' to remove trailing whitespace. 2013-11-03 20:54:05 -05:00
Frame.cpp Merge X11+D3D FreeLook feature into DolphinWX 2013-11-29 06:09:54 +01:00
Frame.h Run code through the advanced tool 'sed' to remove trailing whitespace. 2013-11-03 20:54:05 -05:00
FrameAui.cpp Run code through the advanced tool 'sed' to remove trailing whitespace. 2013-11-03 20:54:05 -05:00
FrameTools.cpp Run code through the advanced tool 'sed' to remove trailing whitespace. 2013-11-03 20:54:05 -05:00
GameListCtrl.cpp Fix format string warnings 2013-11-13 04:01:16 +01:00
GameListCtrl.h Run code through the advanced tool 'sed' to remove trailing whitespace. 2013-11-03 20:54:05 -05:00
GeckoCodeDiag.cpp Run code through the advanced tool 'sed' to remove trailing whitespace. 2013-11-03 20:54:05 -05:00
GeckoCodeDiag.h Support a gcm revision-specific game ini for cheats + partially fix gecko codes in default ini. 2013-09-28 23:38:25 -04:00
GLInterface.h
Globals.h Run code through the advanced tool 'sed' to remove trailing whitespace. 2013-11-03 20:54:05 -05:00
HotkeyDlg.cpp Run code through the advanced tool 'sed' to remove trailing whitespace. 2013-11-03 20:54:05 -05:00
HotkeyDlg.h
InputConfigDiag.cpp Run code through the advanced tool 'sed' to remove trailing whitespace. 2013-11-03 20:54:05 -05:00
InputConfigDiag.h Run code through the advanced tool 'sed' to remove trailing whitespace. 2013-11-03 20:54:05 -05:00
InputConfigDiagBitmaps.cpp Run code through the advanced tool 'sed' to remove trailing whitespace. 2013-11-03 20:54:05 -05:00
ISOFile.cpp Fix format string warnings 2013-11-13 04:01:16 +01:00
ISOFile.h 2x banner images! 2013-09-25 03:06:27 -04:00
ISOProperties.cpp Fix format string warnings 2013-11-13 04:01:16 +01:00
ISOProperties.h Run code through the advanced tool 'sed' to remove trailing whitespace. 2013-11-03 20:54:05 -05:00
LogConfigWindow.cpp Run code through the advanced tool 'sed' to remove trailing whitespace. 2013-11-03 20:54:05 -05:00
LogConfigWindow.h
LogWindow.cpp Run code through the advanced tool 'sed' to remove trailing whitespace. 2013-11-03 20:54:05 -05:00
LogWindow.h
Main.cpp Run code through the advanced tool 'sed' to remove trailing whitespace. 2013-11-03 20:54:05 -05:00
Main.h
MainAndroid.cpp [Android-overlay] Add the new overlay icons. Support configuring them. Disable hardfloat since it has issues since Dalvik doesn't understand passing floats due to ABI differences. 2013-11-29 18:37:33 -06:00
MainNoGUI.cpp Run code through the advanced tool 'sed' to remove trailing whitespace. 2013-11-03 20:54:05 -05:00
MemcardManager.cpp Run code through the advanced tool 'sed' to remove trailing whitespace. 2013-11-03 20:54:05 -05:00
MemcardManager.h Run code through the advanced tool 'sed' to remove trailing whitespace. 2013-11-03 20:54:05 -05:00
NetWindow.cpp Run code through the advanced tool 'sed' to remove trailing whitespace. 2013-11-03 20:54:05 -05:00
NetWindow.h Merge branch 'wiimote-netplay' 2013-09-22 14:27:52 -04:00
PatchAddEdit.cpp Run code through the advanced tool 'sed' to remove trailing whitespace. 2013-11-03 20:54:05 -05:00
PatchAddEdit.h
PHackSettings.cpp
PHackSettings.h
stdafx.cpp
stdafx.h
TASInputDlg.cpp Run code through the advanced tool 'sed' to remove trailing whitespace. 2013-11-03 20:54:05 -05:00
TASInputDlg.h
UDPConfigDiag.cpp Run code through the advanced tool 'sed' to remove trailing whitespace. 2013-11-03 20:54:05 -05:00
UDPConfigDiag.h
VideoConfigDiag.cpp Run code through the advanced tool 'sed' to remove trailing whitespace. 2013-11-03 20:54:05 -05:00
VideoConfigDiag.h Run code through the advanced tool 'sed' to remove trailing whitespace. 2013-11-03 20:54:05 -05:00
WiimoteConfigDiag.cpp Disable wiimote source selection while netplay is running. 2013-11-12 04:16:51 -05:00
WiimoteConfigDiag.h
WXInputBase.cpp
WXInputBase.h
WxUtils.cpp Don't prepend file:// in wxUtils::Explore() on windows. Wxw will just remove it, and/or blow up trying to remove it, if the path isn't ascii. 2013-10-09 16:18:33 -04:00
WxUtils.h 2x banner images! 2013-09-25 03:06:27 -04:00
X11Utils.cpp Run code through the advanced tool 'sed' to remove trailing whitespace. 2013-11-03 20:54:05 -05:00
X11Utils.h