# HG changeset patch
# User Jacob Alexander <haata@kiibohd.com>
# Date 1434317562 25200
# Node ID b29c291ad130f89d1bbbddb25f09e611e6b2bc68
# Parent  66eccdd9ced50fd920511ea0dda6461aa30012f5
Pre-merge cleanup.

diff -r 66eccdd9ced5 -r b29c291ad130 Bootloader/CMakeLists.txt
--- a/Bootloader/CMakeLists.txt	Sun Jun 14 13:56:56 2015 -0700
+++ b/Bootloader/CMakeLists.txt	Sun Jun 14 14:32:42 2015 -0700
@@ -20,8 +20,8 @@
 #| You _MUST_ clean the build directory if you change this value
 #|
 set( CHIP
-	#"mk20dx128vlf5"    # McHCK       mk20dx128vlf5
-	"mk20dx256vlh7"    # Kiibohd-dfu mk20dx256vlh7
+	"mk20dx128vlf5"    # McHCK       mk20dx128vlf5
+#	"mk20dx256vlh7"    # Kiibohd-dfu mk20dx256vlh7
 	CACHE STRING "Chip"
 )
 
diff -r 66eccdd9ced5 -r b29c291ad130 main.c
--- a/main.c	Sun Jun 14 13:56:56 2015 -0700
+++ b/main.c	Sun Jun 14 14:32:42 2015 -0700
@@ -33,7 +33,6 @@
 #include <led.h>
 #include <print.h>
 
-extern volatile uint32_t systick_millis_count;
 
 
 // ----- Functions -----