dolphin/Source/Core
skidau 73da6f4f3f Merge branch 'master' into FIFO-BP
# By Jordan Woyak (46) and others
# Via Jordan Woyak (2) and others
* master: (70 commits)
  Fixes two memory leaks, one is pretty bad for OSX. Yell at pauldachz if this doesn't work. Or... say thanks.
  Added a BluetoothEnumerateInstalledServices call so that the wiimote remembers the pairing.
  Make ARMJit core default CPU core on ARM architecture
  Fix a StringUtil regression from the arm-noglsl merge
  Small improvement to cmpli/cmpi in ARMJit.
  Merge latest ArmEmitter changes from ppsspp while we're at it.
  Ah. I blame vim on this typo entirely.
  Add disabled code for authenticating wiimotes on Windows.
  Add the missing FPR cache
  Buildfix.
  Yell at the user if they change window size while dumping frames, and some other avi dumping stuff.
  Not sure if this is the right way to handle this, but it makes the save states perfectly stable. That's all that really matters, right?
  Abort loading states from incompatible graphics backends.
  ARM Support without GLSL
  Improve VideoSoftware save states. They are fairly stable, but not perfect. OpcodeDecoder::DoState() needs to be fixed.
  Begin implementing save states to video software. Kind of works, sometimes.
  Make error message for loading save state with wrong dsp engine shorter.
  Abort load state if it uses a different dsp engine, instead of crashing.
  Update the gameini of F-zero. Efb to Ram is no longer the default choice.
  fix last commit by neobrain
  ...

Conflicts:
	Source/Core/VideoCommon/Src/Fifo.cpp
2013-03-01 20:12:56 +11:00
..
AudioCommon ARM Support without GLSL 2013-02-26 13:49:00 -06:00
Common Fix a StringUtil regression from the arm-noglsl merge 2013-02-28 13:12:35 +01:00
Core Merge branch 'master' into FIFO-BP 2013-03-01 20:12:56 +11:00
DiscIO Fixes two memory leaks, one is pretty bad for OSX. 2013-03-01 19:21:34 +13:00
DolphinWX Merge branch 'master' into FIFO-BP 2013-03-01 20:12:56 +11:00
InputCommon Fixes two memory leaks, one is pretty bad for OSX. 2013-03-01 19:21:34 +13:00
VideoCommon Merge branch 'master' into FIFO-BP 2013-03-01 20:12:56 +11:00
CMakeLists.txt Merge UI related projects into the main DolphinWX project. 2011-02-11 21:37:52 +00:00