~ruther/qmk_firmware

Change README Makefile and config.h in hhkb
Add NKRO support for LUFA
Merge branch 'bootmagic_salt'(Fix issue #41)
Add bootmagic salt key to avoid accidental configuration
Merge branch 'lockkey_fix'(Fix issue #46)
Add mechanical locking switch support for NumLock and ScrollLock
Merge branch 'macro_mediakey'(Fix issue #42)
Add support for macro media/system keys
Merge branch 'bob_fix'
Cancel tapping when interrupted by other key
Change name ACT_LAYER_TAP1 to ACT_LAYER_TAP_EXT
Add compile conditional for assembler(xprintf)
Merge branch 'hhkb_tmk'
Fix README and doc
Add Caps Lock LED on PD6
Add power control of keyswitch board and tweak scan wait
Merge pull request #44 from Wraul/phantom_fix

Correcting Phantom mistakes
Correction to Phantom readme markdown.
Fix Phantom scroll lock LED.
Merge pull request #40 from yeeeargh/hid_liber-standard-layouts

Added standard layouts for ANSI and ISO to hid_liber
Next