]> git.donarmstrong.com Git - qmk_firmware.git/commit - keyboards/xd60/keymaps/default/keymap.c
Merge remote-tracking branch 'upstream/master' into infinity60
authorjpetermans <tibcmhhm@gmail.com>
Wed, 24 May 2017 18:51:20 +0000 (11:51 -0700)
committerjpetermans <tibcmhhm@gmail.com>
Wed, 24 May 2017 18:51:20 +0000 (11:51 -0700)
commit2dcd6c38fa478b40a973c9411c3f5b4c87ae0ba7
tree289d5cce94ad5883741f0b637749d87680c14d33
parentd89114400c398b900e27bf324a7973d1e0f25e58
parent7a4ec3bd926865e490fbf7c5ec68d762e998683f
Merge remote-tracking branch 'upstream/master' into infinity60