Merge in latest trunk.
authorDean Camera <dean@fourwalledcubicle.com>
Sun, 20 May 2012 15:43:51 +0000 (15:43 +0000)
committerDean Camera <dean@fourwalledcubicle.com>
Sun, 20 May 2012 15:43:51 +0000 (15:43 +0000)
commit063474561de084fbdd8c1ddc02fcce5b8abebe3e
tree831ba5778a2b6adf6f05be487f91d87ab1c18f2c
parent666088a38818e371cc8ad89360c960d86b311a49
parentb181cf4fb87c289b2aed93e44d03b20b6b9ba623
Merge in latest trunk.
103 files changed:
Bootloaders/CDC/BootloaderCDC.txt
Bootloaders/CDC/makefile
Bootloaders/DFU/BootloaderDFU.txt
Bootloaders/DFU/makefile
Bootloaders/HID/makefile
Demos/Device/ClassDriver/AudioInput/AudioInput.txt
Demos/Device/ClassDriver/AudioInput/makefile
Demos/Device/ClassDriver/AudioOutput/AudioOutput.txt
Demos/Device/ClassDriver/AudioOutput/makefile
Demos/Device/ClassDriver/DualVirtualSerial/makefile
Demos/Device/ClassDriver/GenericHID/GenericHID.txt
Demos/Device/ClassDriver/GenericHID/makefile
Demos/Device/ClassDriver/Joystick/makefile
Demos/Device/ClassDriver/Keyboard/makefile
Demos/Device/ClassDriver/KeyboardMouse/makefile
Demos/Device/ClassDriver/KeyboardMouseMultiReport/makefile
Demos/Device/ClassDriver/MIDI/makefile
Demos/Device/ClassDriver/MassStorage/MassStorage.txt
Demos/Device/ClassDriver/MassStorage/makefile
Demos/Device/ClassDriver/MassStorageKeyboard/MassStorageKeyboard.txt
Demos/Device/ClassDriver/MassStorageKeyboard/makefile
Demos/Device/ClassDriver/Mouse/makefile
Demos/Device/ClassDriver/RNDISEthernet/RNDISEthernet.txt
Demos/Device/ClassDriver/RNDISEthernet/makefile
Demos/Device/ClassDriver/VirtualSerial/makefile
Demos/Device/ClassDriver/VirtualSerialMassStorage/VirtualSerialMassStorage.txt
Demos/Device/ClassDriver/VirtualSerialMassStorage/makefile
Demos/Device/ClassDriver/VirtualSerialMouse/makefile
Demos/Device/Incomplete/Sideshow/makefile
Demos/Device/Incomplete/TestAndMeasurement/makefile
Demos/Device/LowLevel/AudioInput/AudioInput.txt
Demos/Device/LowLevel/AudioInput/makefile
Demos/Device/LowLevel/AudioOutput/AudioOutput.txt
Demos/Device/LowLevel/AudioOutput/makefile
Demos/Device/LowLevel/DualVirtualSerial/makefile
Demos/Device/LowLevel/GenericHID/GenericHID.txt
Demos/Device/LowLevel/GenericHID/makefile
Demos/Device/LowLevel/Joystick/makefile
Demos/Device/LowLevel/Keyboard/makefile
Demos/Device/LowLevel/KeyboardMouse/makefile
Demos/Device/LowLevel/MIDI/makefile
Demos/Device/LowLevel/MassStorage/MassStorage.txt
Demos/Device/LowLevel/MassStorage/makefile
Demos/Device/LowLevel/Mouse/makefile
Demos/Device/LowLevel/RNDISEthernet/RNDISEthernet.txt
Demos/Device/LowLevel/RNDISEthernet/makefile
Demos/Device/LowLevel/VirtualSerial/makefile
Demos/DualRole/ClassDriver/MouseHostDevice/makefile
Demos/Host/ClassDriver/AndroidAccessoryHost/makefile
Demos/Host/ClassDriver/AudioInputHost/makefile
Demos/Host/ClassDriver/AudioOutputHost/AudioOutputHost.txt
Demos/Host/ClassDriver/AudioOutputHost/makefile
Demos/Host/ClassDriver/JoystickHostWithParser/makefile
Demos/Host/ClassDriver/KeyboardHost/makefile
Demos/Host/ClassDriver/KeyboardHostWithParser/makefile
Demos/Host/ClassDriver/MIDIHost/makefile
Demos/Host/ClassDriver/MassStorageHost/makefile
Demos/Host/ClassDriver/MouseHost/makefile
Demos/Host/ClassDriver/MouseHostWithParser/makefile
Demos/Host/ClassDriver/PrinterHost/makefile
Demos/Host/ClassDriver/RNDISEthernetHost/makefile
Demos/Host/ClassDriver/StillImageHost/makefile
Demos/Host/ClassDriver/VirtualSerialHost/makefile
Demos/Host/LowLevel/AndroidAccessoryHost/makefile
Demos/Host/LowLevel/AudioInputHost/makefile
Demos/Host/LowLevel/AudioOutputHost/AudioOutputHost.txt
Demos/Host/LowLevel/AudioOutputHost/makefile
Demos/Host/LowLevel/GenericHIDHost/makefile
Demos/Host/LowLevel/JoystickHostWithParser/makefile
Demos/Host/LowLevel/KeyboardHost/makefile
Demos/Host/LowLevel/KeyboardHostWithParser/makefile
Demos/Host/LowLevel/MIDIHost/makefile
Demos/Host/LowLevel/MassStorageHost/makefile
Demos/Host/LowLevel/MouseHost/makefile
Demos/Host/LowLevel/MouseHostWithParser/makefile
Demos/Host/LowLevel/PrinterHost/makefile
Demos/Host/LowLevel/RNDISEthernetHost/makefile
Demos/Host/LowLevel/StillImageHost/makefile
Demos/Host/LowLevel/VirtualSerialHost/makefile
Projects/AVRISP-MKII/AVRISP-MKII.txt
Projects/AVRISP-MKII/Config/AppConfig.h
Projects/AVRISP-MKII/Config/LUFAConfig.h
Projects/AVRISP-MKII/Descriptors.h
Projects/AVRISP-MKII/makefile
Projects/Benito/Benito.txt
Projects/Benito/makefile
Projects/HIDReportViewer/makefile
Projects/LEDNotifier/makefile
Projects/MIDIToneGenerator/MIDIToneGenerator.txt
Projects/MIDIToneGenerator/makefile
Projects/Magstripe/Magstripe.txt
Projects/Magstripe/makefile
Projects/MediaController/makefile
Projects/MissileLauncher/makefile
Projects/RelayBoard/makefile
Projects/SerialToLCD/makefile
Projects/TempDataLogger/TemperatureDataLogger.txt
Projects/TempDataLogger/makefile
Projects/USBtoSerial/makefile
Projects/Webserver/Webserver.txt
Projects/Webserver/makefile
Projects/XPLAINBridge/XPLAINBridge.txt
Projects/XPLAINBridge/makefile