]> git.donarmstrong.com Git - qmk_firmware.git/commit - keyboards/xd60/keymaps/default/keymap.c
Merge branch 'promethium' of github.com:priyadi/qmk_firmware into promethium
authorPriyadi Iman Nurcahyo <priyadi@priyadi.net>
Sun, 8 Jan 2017 19:48:07 +0000 (02:48 +0700)
committerPriyadi Iman Nurcahyo <priyadi@priyadi.net>
Sun, 8 Jan 2017 19:48:07 +0000 (02:48 +0700)
commit3a71f3534ad45e420c94dd519858646f3c2b925f
tree0cbe5048836455cf1803a30d1eafb02a24fdf92e
parent58b2536bf106fd18a265843ba43784fa3e6be384
parentb0a9bd319bf5535e2762746da8ff77dd3cf87ca4
Merge branch 'promethium' of github.com:priyadi/qmk_firmware into promethium