Jordan Woyak c4df69a342 Merge branch 'master' into real-wiimote-scanning ...

Conflicts:
	Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp
	Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp

2013-02-07 20:22:06 -06:00

..

resources

Remove some unused resource files.

2013-01-16 17:09:09 -06:00

Src

Merge branch 'master' into real-wiimote-scanning

2013-02-07 20:22:06 -06:00

CMakeLists.txt

Merge branch 'GLES-software'

2012-12-26 12:54:58 -06:00

Dolphin.vcxproj

Added a script to copy the OpenAL dll's to the main Dolphin folder on new builds.

2013-02-03 19:02:46 +11:00

Dolphin.vcxproj.filters

remove scons files from VS projects

2012-03-18 06:41:12 -07:00

Dolphin.vcxproj.user

vs2010: make -d be passed to debugfast builds launched from vs

2011-02-25 04:00:16 +00:00

DolphinWX.rc

Define the icon for "dolphin". The IDI_ICON1 seems to be preempted by the wx resource. This one does not.

2012-12-17 08:33:42 -06:00

Info.plist.in

Applied compile and link flags from SCons build for OS X to CMake build.

2011-12-11 21:27:06 +01:00

resource.h

…