Ryan Houdek ba18f38e70 Merge branch 'master' into android-new-control-input-overlay ...

Conflicts:
	Source/Android/res/values-ja/strings.xml
	Source/Android/res/values/strings.xml
	Source/Android/src/org/dolphinemu/dolphinemu/AboutFragment.java
	Source/Android/src/org/dolphinemu/dolphinemu/emulation/EmulationActivity.java
	Source/Android/src/org/dolphinemu/dolphinemu/folderbrowser/FolderBrowser.java
	Source/Android/src/org/dolphinemu/dolphinemu/gamelist/GameListActivity.java
	Source/Android/src/org/dolphinemu/dolphinemu/settings/video/VideoSettingsFragment.java

2013-11-24 16:12:00 -06:00

..

Android

[Android-overlay] Support multiple gamepads with touch screen controls.

2013-11-24 15:04:53 -06:00

Debugger

Run code through the advanced tool 'sed' to remove trailing whitespace.

2013-11-03 20:54:05 -05:00

GLInterface

Run code through the advanced tool 'sed' to remove trailing whitespace.

2013-11-03 20:54:05 -05: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

Lastly - new license header introduced to main Dolphin project. All done now.

2013-04-17 23:43:35 -04:00

ARCodeAddEdit.cpp

Run code through the advanced tool 'sed' to remove trailing whitespace.

2013-11-03 20:54:05 -05:00

ARCodeAddEdit.h

Lastly - new license header introduced to main Dolphin project. All done now.

2013-04-17 23:43:35 -04:00

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

Run code through the advanced tool 'sed' to remove trailing whitespace.

2013-11-03 20:54:05 -05: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

Lastly - new license header introduced to main Dolphin project. All done now.

2013-04-17 23:43:35 -04:00

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

Lastly - new license header introduced to main Dolphin project. All done now.

2013-04-17 23:43:35 -04:00

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

Lastly - new license header introduced to main Dolphin project. All done now.

2013-04-17 23:43:35 -04:00

LogWindow.cpp

Run code through the advanced tool 'sed' to remove trailing whitespace.

2013-11-03 20:54:05 -05:00

LogWindow.h

LogWindow: Fix a bad initializer

2013-07-05 22:39:18 -04:00

Main.cpp

Run code through the advanced tool 'sed' to remove trailing whitespace.

2013-11-03 20:54:05 -05:00

Main.h

On windows, ignore WM_QUERYENDSESSION and close upon WM_ENDSESSION.

2013-09-10 03:14:21 -07:00

MainAndroid.cpp

Merge branch 'master' into android-new-control-input-overlay

2013-11-24 16:12:00 -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

Lastly - new license header introduced to main Dolphin project. All done now.

2013-04-17 23:43:35 -04:00

PHackSettings.cpp

Overlay local gameinis over global gameinis instead of copying.

2013-09-14 17:46:41 +02:00

PHackSettings.h

Lastly - new license header introduced to main Dolphin project. All done now.

2013-04-17 23:43:35 -04:00

stdafx.cpp

Lastly - new license header introduced to main Dolphin project. All done now.

2013-04-17 23:43:35 -04:00

stdafx.h

Lastly - new license header introduced to main Dolphin project. All done now.

2013-04-17 23:43:35 -04:00

TASInputDlg.cpp

Run code through the advanced tool 'sed' to remove trailing whitespace.

2013-11-03 20:54:05 -05:00

TASInputDlg.h

A bunch of trivial changes to fix clang warnings.

2013-09-01 22:58:33 -04:00

UDPConfigDiag.cpp

Run code through the advanced tool 'sed' to remove trailing whitespace.

2013-11-03 20:54:05 -05:00

UDPConfigDiag.h

Move UDPConfigDiag into Dolphin, to allow building of UDP Wiimote again.

2010-11-14 13:30:57 +00:00

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

A bunch of trivial changes to fix clang warnings.

2013-09-01 22:58:33 -04:00

WXInputBase.cpp

Lastly - new license header introduced to main Dolphin project. All done now.

2013-04-17 23:43:35 -04:00

WXInputBase.h

Lastly - new license header introduced to main Dolphin project. All done now.

2013-04-17 23:43:35 -04:00

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

Move in-game keybinding handling to a central location

2013-07-21 23:17:16 -04:00