Merge branch 'wii-usb' into temp merge branch

Browse Source

Conflicts:
	Source/Core/Common/Src/Log.h
	Source/Core/Core/Core.vcxproj
	Source/Core/Core/Core.vcxproj.filters
	Source/VSProps/Dolphin.Win32.props
	Source/VSProps/Dolphin.x64.props

...

This commit is contained in:

Matthew Parlane

2013-01-11 23:07:12 +13:00

parent 9af785532e 08cc460e96

commit 9754fda516

15 changed files with 2329 additions and 22 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

1443

Externals/libusb/include/libusb.h vendored Normal file

File diff suppressed because it is too large Load Diff

BIN

Externals/libusb/win32/libusb-1.0.lib vendored Normal file

Binary file not shown.

BIN

Externals/libusb/x64/libusb-1.0.lib vendored Normal file

Binary file not shown.