]> git.donarmstrong.com Git - qmk_firmware.git/commit
merging
authorJack Humbert <jack.humb@gmail.com>
Sun, 16 Aug 2015 21:56:15 +0000 (17:56 -0400)
committerJack Humbert <jack.humb@gmail.com>
Sun, 16 Aug 2015 21:56:15 +0000 (17:56 -0400)
commitc9cbff446f58262ef9c26b7ce280f37e36b15b9a
tree1917ebd3b78dfbad7a6555b5ce425c551ca356ca
parentc5a8287dea6f5d9d798d0ea5b43b08d2c362c71d
parente12c0de608be5b3239222735bb6403e0fda3fb26
merging
keyboard/atomic/Makefile
keyboard/atomic/keymap_common.h
keyboard/atomic/matrix.c
keyboard/planck/Makefile
keyboard/planck/matrix_handwired.c
keyboard/planck/matrix_pcb.c