]> git.donarmstrong.com Git - qmk_firmware.git/commit
Merge branch 'master' into coderkun_neo2
authorcoderkun <olli@coderkun.de>
Sat, 1 Apr 2017 08:56:29 +0000 (10:56 +0200)
committercoderkun <olli@coderkun.de>
Sat, 1 Apr 2017 08:56:29 +0000 (10:56 +0200)
commit605c4129cc89e8fe647881108b0c9c79d4da1aea
tree9af55a60d567bd66b5c8572c04ab63b62abb5a02
parentb0ade6dc9838d4112cbc3093ac3033aa81ef172d
parent3448d5d4874a2775f85320a2be69edd241575d46
Merge branch 'master' into coderkun_neo2
keyboards/ergodox/keymaps/coderkun_neo2/keymap.c