]> git.donarmstrong.com Git - qmk_firmware.git/commit
Merge branch 'master'
authorJason Janse van Rensburg <l33tjas.0n@gmail.com>
Tue, 30 Aug 2016 12:54:00 +0000 (14:54 +0200)
committerJason Janse van Rensburg <l33tjas.0n@gmail.com>
Tue, 30 Aug 2016 12:54:00 +0000 (14:54 +0200)
commitfc2ca62a3b9552175eb7c27cc11f3a5af6cfae50
tree59b2f2406f472a9fd2af4946420d1a1c880929c0
parenta41a7a9100b9f4c6bfdf49b39b05e626ffd95397
parent8e00c464e6f488d86e0768a77a2ad5ee238dba6d
Merge branch 'master'

Conflicts:
keyboards/planck/keymaps/bone2planck/keymap.c
keyboards/planck/keymaps/bone2planck/keymap.c