diff options
| author | Erez Zukerman <ezuk@madmimi.com> | 2015-11-10 04:40:52 +0200 |
|---|---|---|
| committer | Erez Zukerman <ezuk@madmimi.com> | 2015-11-10 04:40:52 +0200 |
| commit | ea44ac4a622329f719ff82497fb47c9d3f623364 (patch) | |
| tree | 4e11eab0d565deb75ecbbd1bd8393cc59ca54567 | |
| parent | 926ce2262f140f29c94d53984cc6eba8b62caab6 (diff) | |
| parent | 24cb218de0a0ca50c2d1f6c4caadb6677b84be3c (diff) | |
Merge branch 'master' of github.com:jackhumbert/qmk_firmware
Conflicts:
keyboard/ergodox_ez/keymaps/keymap_default.c
0 files changed, 0 insertions, 0 deletions