Merge in latest trunk.

This commit is contained in:
Dean Camera 2012-05-20 17:16:21 +00:00
commit 5f709e281e
18 changed files with 115 additions and 361 deletions

View file

@ -43,10 +43,10 @@
#include <LUFA/Drivers/USB/USB.h>
#include "../Descriptors.h"
#include "../AVRISPDescriptors.h"
#include "V2ProtocolConstants.h"
#include "V2ProtocolParams.h"
// #include "ISP/ISPProtocol.h"
#include "ISP/ISPProtocol.h"
#include "XPROG/XPROGProtocol.h"
#include "Config/AppConfig.h"