]> git.donarmstrong.com Git - qmk_firmware.git/commit
Merge branch 'master' into don
authorDon Armstrong <don@donarmstrong.com>
Thu, 12 Jan 2017 23:44:25 +0000 (17:44 -0600)
committerDon Armstrong <don@donarmstrong.com>
Thu, 12 Jan 2017 23:44:25 +0000 (17:44 -0600)
commit51deb8fcd52405709b3554815435e4eb00ade961
tree7f7ee1543a6e4e88434b8aa8d6b25469fcf46af5
parent17c74a2428bcdac9205e2bc78bd87bf37b0b2d50
parent176b93d08eb5cc0c65a6d571fc2c1fec5f575854
Merge branch 'master' into don
keyboards/ergodox/keymaps/default/keymap.c