Pierre Bourdon fdff4cb1ff Merge branch 'master' into wii-network ...

Conflicts:
	Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp
	Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp
	Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp
	Source/VSProps/Dolphin.Win32.props
	Source/VSProps/Dolphin.x64.props

2012-05-16 09:27:37 +02:00

..

Base.props

vs2010: add debugfast configs for all projects except wxw...will do those soon.

2011-02-10 02:53:08 +00:00

CodeGen_Debug.props

openssl: enable ec/dsa and rearrange files in Externals a bit.

2012-02-27 00:51:50 -08:00

CodeGen_DebugFast.props

openssl: enable ec/dsa and rearrange files in Externals a bit.

2012-02-27 00:51:50 -08:00

CodeGen_Release.props

I am very picky about my VS files... :D

2012-03-21 14:53:50 -07:00

Dolphin.Win32.props

Merge branch 'master' into wii-network

2012-05-16 09:27:37 +02:00

Dolphin.x64.props

Merge branch 'master' into wii-network

2012-05-16 09:27:37 +02:00

PrecompiledHeader.props

vs2010:

2011-02-08 04:03:48 +00:00

WXWOverrides.props

forgot to add wxwidgets3 vcxproj to git, since it was masked by gitignore...

2012-03-18 03:30:03 -07:00