Merge branch 'master' of github.com:jackhumbert/qmk_firmware

Browse Source

Conflicts:
	keyboard/ergodox_ez/keymaps/keymap_default.c

pull/38/head

Erez Zukerman 9 years ago

parent 926ce2262f 24cb218de0

commit ea44ac4a62

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File

Diff Content Not Available