# HG changeset patch
# User Jacob Alexander <jacob.alexander@virtualinstruments.com>
# Date 1452726230 28800
# Node ID bc047e37ddf1d44b00df37c3b9657268bc9d542e
# Parent  b4bb195dac76a4ff9393574f641e21ce5c04554e# Parent  98c896e00f9f2a62c8b7bc398f9b7b7389f64331
Merge branch 'master' of github.com:kiibohd/controller

diff -r 98c896e00f9f -r bc047e37ddf1 CMakeLists.txt
--- 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" )