]> git.donarmstrong.com Git - qmk_firmware.git/commit - keyboard/retro_refit/Makefile
projects / qmk_firmware.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 6428069 b25dbc4)
Merge branch 'master' of github.com:jackhumbert/qmk_firmware
authorNathan Sharfi <me@ngalt.com>
Sun, 31 Jul 2016 21:02:25 +0000 (14:02 -0700)
committerNathan Sharfi <me@ngalt.com>
Sun, 31 Jul 2016 21:02:25 +0000 (14:02 -0700)
commitd889648d5373b7ff77dc7bc4b369c628e8336b45
tree35c6eb194417242958baf54b36f0ff3a56e378f1tree | snapshot
parent6428069eb70f5cc47ac1f3f9acf3daea14fb9097commit | diff
parentb25dbc484d639210c53d8e13f79cf5a77f2faaaacommit | diff
Merge branch 'master' of github.com:jackhumbert/qmk_firmware

# Conflicts:
# keyboard/ergodox_ez/keymaps/zweihander-osx/keymap.c
# keyboard/ergodox_ez/keymaps/zweihander-osx/zweihander-osx.hex
keyboards/ergodox/keymaps/zweihander-osx/readme.markdown | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.