From fef991e28b56ce3e8de86833f00b6b7e77f1e84c Mon Sep 17 00:00:00 2001
From: Dean Camera <dean@fourwalledcubicle.com>
Date: Sat, 11 Oct 2014 15:42:16 +1100
Subject: [PATCH] The ATPROGRAM LUFA build system module now defaults to the
 Atmel ICE debuger tool, instead of the Atmel JTAG ICE3.

---
 LUFA/Build/lufa_atprogram.mk               | 2 +-
 LUFA/DoxygenPages/MigrationInformation.txt | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/LUFA/Build/lufa_atprogram.mk b/LUFA/Build/lufa_atprogram.mk
index 943383418..253bd0724 100644
--- a/LUFA/Build/lufa_atprogram.mk
+++ b/LUFA/Build/lufa_atprogram.mk
@@ -55,7 +55,7 @@ ERROR_IF_EMPTY   ?= $(if $(strip $($(strip $(1)))), , $(error Makefile $(strip $
 ERROR_IF_NONBOOL ?= $(if $(filter Y N, $($(strip $(1)))), , $(error Makefile $(strip $(1)) option must be Y or N))
 
 # Default values of optionally user-supplied variables
-ATPROGRAM_PROGRAMMER ?= jtagice3
+ATPROGRAM_PROGRAMMER ?= atmelice
 ATPROGRAM_INTERFACE  ?= jtag
 ATPROGRAM_PORT       ?=
 
diff --git a/LUFA/DoxygenPages/MigrationInformation.txt b/LUFA/DoxygenPages/MigrationInformation.txt
index 14ff71905..baabb3f82 100644
--- a/LUFA/DoxygenPages/MigrationInformation.txt
+++ b/LUFA/DoxygenPages/MigrationInformation.txt
@@ -11,7 +11,8 @@
  *  areas relevant to making older projects compatible with the API changes of each new release.
  *
  *  \section Sec_MigrationXXXXXX Migrating from 140928 to XXXXXX
- *   None.
+ *  <b>Non-USB Library Components</b>
+ *    - The ATPROGRAM LUFA build system module now defaults to the Atmel ICE debuger tool, instead of the Atmel JTAG ICE3.
  *
  *  \section Sec_Migration140928 Migrating from 140302 to 140928
  *  <b>Device Mode</b>
-- 
GitLab