dolphin, branch stable GameCube and Wii emulator Merge pull request #2687 from AdmiralCurtiss/temp-settings-ini-hotfix 2015-12-02T14:34:28+00:00 Markus Wick degasus@users.noreply.github.com 2015-12-02T14:34:28+00:00 c55481882f9350f6f4835df24efaca4e79ede045 Config Hotfix: Prevent per-game settings (ie. GameINI) being stored to the global user configuration. 
Config Hotfix: Prevent per-game settings (ie. GameINI) being stored to the global user configuration.
 Merge pull request #2816 from comex/huh-where-did-this-go 2015-10-28T20:37:36+00:00 comex comexk@gmail.com 2015-08-09T06:55:36+00:00 110ec72cff8a19c7125e6a69c691f1f67f755982 Make the LLVM detect script verify that the dynamic library actually exists. 
Make the LLVM detect script verify that the dynamic library actually exists.
Merge pull request #2717 from phire/fix-reordering 2015-10-03T14:21:13+00:00 Scott Mansell phiren@gmail.com 2015-07-21T17:16:51+00:00 452a0f804287c0b87546970dc28969c62e91fccd PPCAnalyst: Don't swap instruction which might cause interrupts. 
PPCAnalyst: Don't swap instruction which might cause interrupts.
Merge pull request #3066 from degasus/master 2015-09-23T19:09:03+00:00 flacs tilkax@gmail.com 2015-09-20T01:30:46+00:00 bfd5c6c69d3aeb43c1bdc3f8edaee67c886f2380 GLInterface: Fix VideoSW on linux + OSX (v2) Conflicts: Source/Core/VideoBackends/OGL/GLInterface/GLX.cpp 
GLInterface: Fix VideoSW on linux + OSX (v2)

Conflicts:
	Source/Core/VideoBackends/OGL/GLInterface/GLX.cpp
Merge pull request #2829 from JosJuice/fix-wii-fst-size-2 2015-09-23T19:09:02+00:00 Lioncash mathew1800@gmail.com 2015-09-12T04:50:00+00:00 2814aa20c843f3a6d0fc050804aa128f2111e2c3 Fix reading Wii FST size (for real this time) 
Fix reading Wii FST size (for real this time)
Merge pull request #3025 from Tilka/fixfix 2015-09-23T19:09:02+00:00 Ryan Houdek Sonicadvance1@gmail.com 2015-09-12T05:38:14+00:00 bfdbace69be927f2a233e6b0497e02a7eb25485f VertexLoaderX64: fix 2GB warnings 
VertexLoaderX64: fix 2GB warnings
Merge pull request #2995 from endrift/tasinputdlg-threading 2015-09-23T19:09:01+00:00 Lioncash mathew1800@gmail.com 2015-09-12T04:42:21+00:00 3556bc0bed200037c23a6191ca01d192a6eb0695 DolphinWX: TAS fixes, take three 
DolphinWX: TAS fixes, take three
Merge pull request #2968 from t27duck/lost_levels_missing_ini 2015-09-23T19:09:01+00:00 Scott Mansell phiren@gmail.com 2015-09-05T02:05:48+00:00 2cd05f2225e8a8423d43e61c8bf3e484e1c275a1 Add missing INI file for SMB: The Lost Levels 
Add missing INI file for SMB: The Lost Levels
Merge pull request #2933 from t27duck/mm5_missing_ini 2015-09-23T19:09:00+00:00 Scott Mansell phiren@gmail.com 2015-09-03T00:13:59+00:00 31584057a3f37dd818d14e59ddcd5234a13f0df9 Added missing Mega Man 5 INI file 
Added missing Mega Man 5 INI file
Merge pull request #2996 from jcowgill/stable 2015-09-07T13:29:41+00:00 Pierre Bourdon delroth@gmail.com 2015-09-07T13:29:41+00:00 41201023056a7353e9c9a6c93837b3c8f9a77f18 Fix build error with -Werror=format-security 
Fix build error with -Werror=format-security