changeset 404:bc047e37ddf1

Merge branch 'master' of github.com:kiibohd/controller
author Jacob Alexander <jacob.alexander@virtualinstruments.com>
date Wed, 13 Jan 2016 15:03:50 -0800
parents b4bb195dac76 (diff) 98c896e00f9f (current diff)
children f2c9dd76a1fb
files
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/CMakeLists.txt	Tue Jan 05 10:31:36 2016 -0800
+++ b/CMakeLists.txt	Wed Jan 13 15:03:50 2016 -0800
@@ -23,7 +23,7 @@
 #       "at90usb1286"      # Teensy++ 2.0 (avr)
 #       "mk20dx128"        # Teensy   3.0 (arm)
 	"mk20dx128vlf5"    # McHCK       mk20dx128vlf5
-#       "mk20dx256"        # Teensy   3.1 (arm)
+#       "mk20dx256"        # Teensy   3.1,3.2 (arm)
 #       "mk20dx256vlh7"    # Kiibohd-dfu mk20dx256vlh7
 	CACHE STRING "Microcontroller Chip" )