Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware

2016-08-04 11:10:41 -04:00
parent 2d59c97ec1 213cb2c243
commit 64e051652b
264 changed files with 5407 additions and 2306 deletions
--- a/keyboards/planck/keymaps/cbbrowne/keymap.c
+++ b/keyboards/planck/keymaps/cbbrowne/keymap.c
@@ -4,6 +4,7 @@
 #endif
 #include "config.h"
 #include "quantum.h"
+#include "version.h"

 /* Each layer is given a name to aid in readability, which is then
   used in the keymap matrix below.  The underscores do not denote