Merge pull request #592 from sethbc/ez-sethbc
Ez sethbc
Merge pull request #593 from J3RN/master
Updated the J3RN ErgoDox keymap
Merge pull request #600 from adiabatic/master
zweihander-osx: add left-hand-thumb tab key
automatically forward ergodox ez
Merge pull request #597 from Jiehong/feature/basic_keyboard_doc
feature: add basic doc about how a keyboard works on USB
Merge pull request #596 from fredizzimo/rid_of_quick
Fix the makefile dependencies and remove quick targets
Thumb ⌫ into ⇥, numpad & into :, yank home/end
Also: add (back?) in the light-shine disabler
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
feature: add basic doc about how a keyboard works on USB
This comes from the discussion on #520
Travis calls the normal build target, instead of quick
Fix the readme for the removed quick target
Remove the quick commands and add proper clean
Also depend on the gcc version
Generate version information to version.h
So that only the files that really needs a version are recompiled.
Force compilation and linking when options changes
More reliable .d file generation
Also generated inside the obj dir instead of separate deps folder.