From: Rowan Decker <Smasher816@gmail.com>
Date: Mon, 9 Mar 2015 00:25:13 +0000 (-0700)
Subject: Merge branch 'master' of https://github.com/smasher816/controller
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=a6fdeb47ea9b4ef7ccde34c6915a660e411ad78b;p=kiibohd-controller.git

Merge branch 'master' of https://github.com/smasher816/controller
---

a6fdeb47ea9b4ef7ccde34c6915a660e411ad78b
diff --cc Bootloader/_buildvars.h
index 08d1a7e,08d1a7e..d6c2a6b
--- a/Bootloader/_buildvars.h
+++ b/Bootloader/_buildvars.h
@@@ -29,18 -29,18 +29,18 @@@
  // ----- Defines -----
  
  // You can change these to give your code its own name.
--#define STR_MANUFACTURER	u"Kiibohd"
--#define STR_PRODUCT		u"Kiibohd DFU Bootloader"
++#define STR_MANUFACTURER        u"Kiibohd"
++#define STR_PRODUCT             u"Kiibohd DFU Bootloader"
  #define STR_SERIAL              u"@CHIP@"
--#define STR_ALTNAME              u"@BOOT_DFU_ALTNAME@"
++#define STR_ALTNAME             u"@BOOT_DFU_ALTNAME"
  
  
  // Mac OS-X and Linux automatically load the correct drivers.  On
  // Windows, even though the driver is supplied by Microsoft, an
  // INF file is needed to load the driver.  These numbers need to
  // match the INF file.
--#define VENDOR_ID		@BOOT_VENDOR_ID@
--#define PRODUCT_ID		@BOOT_PRODUCT_ID@
++#define VENDOR_ID         @BOOT_VENDOR_ID@
++#define PRODUCT_ID        @BOOT_PRODUCT_ID@
  
  #endif