Merge pull request #841 from jacwib/master

Update jacwib keymap to version 1.2

Merge pull request #831 from kejadlen/master

add alphadox layouts to atreus and ergodox

Merge pull request #834 from kazufukurou/master

add programmer dvorak keymap

[alphadox] remove tmk reset code

[ergodox][alphadox] undefine tapping_term, ignore_mod_tap_interrupt

add alphadox layouts to atreus and ergodox

1.2 update

Update readme to reflect 1.1 changes.

Update keymap to reflect 1.1 changes.

Update readme to reflect changes

Merge pull request #833 from h-parks/master

Win10 Writer's Block - An ErgoDox Keymap

Merge pull request #832 from PhoenixRion/master

Phoenix Layout

add programmer dvorak keymap

Win10 Writer's Block - An ErgoDox Keymap

fix for compiling on infinity:

replaced `_delay_ms()' with `wait_ms()'
included "wait.h"

Win10 Writer's Block - An ErgoDox Keymap

This is a QWERTY layout for ErgoDox on QMK. It's designed to work well in MS Office-like environments. It's tested on Windows 7 and 10.

update header file

didn't read PR comment close enough, correcting folder

moving keymap to new location

Merge remote-tracking branch 'upstream/master'

* upstream/master: (1239 commits)
  Update ez.c
  removes planck/rev3 temporarily
  Move hand_swap_config to ez.c, removes error for infinity
  Update Makefile
  ergodox: Update algernon's keymap to v1.9
  Added VS Code dir to .gitignore
  Support the Pegasus Hoof controller.
  [Jack & Erez] Simplifies and documents TO
  add readme
  use wait_ms instead of _delay_ms
  add messenger
  init keymap
  Add example keymap
  Adding whiskey_tango_foxtrot_capslock ergodox keymap
  Unicode map framework. Allow unicode up to 0xFFFFF using separate mapping table
  CIE 1931 dim curve
  Apply the dim curve to the RGB output
  Update the Cluecard readme files
  Tune snake and knight intervals for Cluecard
  Tunable RGB light intervals
  ...

Merge pull request #829 from r2d2rogers/master

Move hand_swap_config to ez.c, removes error for infinity