5 commits

Author	SHA1	Message	Date
dbroqua	e9f69ff46e	- Revert local fail o_O	2016-12-17 22:33:45 +01:00
dbroqua	a849bdc581	- Merged	2016-11-27 11:44:30 +01:00
Lior Haim	0d26320cf3	merge upstream	2016-10-23 20:22:28 +03:00
h-parks	f2197611c7	Win10 Writer's Block - An ErgoDox Keymap ... fix for compiling on infinity: replaced `_delay_ms()' with `wait_ms()' included "wait.h"	2016-10-19 09:33:37 -05:00
h-parks	1688c014cc	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.	2016-10-18 21:58:33 -05:00