aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDean Camera <dean@fourwalledcubicle.com>2014-03-01 21:09:00 +1100
committerDean Camera <dean@fourwalledcubicle.com>2014-03-01 21:09:00 +1100
commita80d0c99653353bfe6e03276bc9884f5b99340c6 (patch)
tree490302b52b99c297e38ad19e88a5498a666a45e6
parentfa32989f2e85df6307b979ce35df13e23f344ed1 (diff)
downloadlufa-a80d0c99653353bfe6e03276bc9884f5b99340c6.tar.gz
lufa-a80d0c99653353bfe6e03276bc9884f5b99340c6.tar.bz2
lufa-a80d0c99653353bfe6e03276bc9884f5b99340c6.zip
Add Atmel Studio 6.2 compatibility.
-rw-r--r--Bootloaders/DFU/BootloaderDFU.h2
-rw-r--r--LUFA/StudioIntegration/VSIX/extension.vsixmanifest1
2 files changed, 2 insertions, 1 deletions
diff --git a/Bootloaders/DFU/BootloaderDFU.h b/Bootloaders/DFU/BootloaderDFU.h
index 5efcce388..c5d812847 100644
--- a/Bootloaders/DFU/BootloaderDFU.h
+++ b/Bootloaders/DFU/BootloaderDFU.h
@@ -68,7 +68,7 @@
#define BOOTLOADER_VERSION_REV 0
/** Magic bootloader key to unlock forced application start mode. */
- #define MAGIC_BOOT_KEY 0xDC42
+ #define MAGIC_BOOT_KEY 0xDC42
/** Complete bootloader version number expressed as a packed byte, constructed from the
* two individual bootloader version macros.
diff --git a/LUFA/StudioIntegration/VSIX/extension.vsixmanifest b/LUFA/StudioIntegration/VSIX/extension.vsixmanifest
index afe6a70ec..ea6edeb25 100644
--- a/LUFA/StudioIntegration/VSIX/extension.vsixmanifest
+++ b/LUFA/StudioIntegration/VSIX/extension.vsixmanifest
@@ -14,6 +14,7 @@
<SupportedProducts>
<IsolatedShell Version="6.1">AtmelStudio</IsolatedShell>
+ <IsolatedShell Version="6.2">AtmelStudio</IsolatedShell>
</SupportedProducts>
<SupportedFrameworkRuntimeEdition MinVersion="4.0" MaxVersion="4.5"/>