Merge remote-tracking branch 'refs/remotes/jackhumbert/master' into pc_planck
47 files changed, 11041 insertions(+), 2736 deletions(-) M 1-setup-path-win.bat M README.md A keyboard/ergodox_ez/keymaps/alexjj/keymap.c A keyboard/ergodox_ez/keymaps/alexjj/keymap.hex A keyboard/ergodox_ez/keymaps/alexjj/readme.md A keyboard/ergodox_ez/keymaps/alexjj/rl-layout.jpg A keyboard/ergodox_ez/keymaps/german-manuneo/compile_keymap.py A keyboard/ergodox_ez/keymaps/german-manuneo/german-manuneo.hex A keyboard/ergodox_ez/keymaps/german-manuneo/keymap.c A keyboard/ergodox_ez/keymaps/german-manuneo/keymap.md M keyboard/ergodox_ez/keymaps/j3rn/keymap.c M keyboard/ergodox_ez/keymaps/j3rn/readme.md M keyboard/ergodox_ez/keymaps/ordinary/keymap.c M keyboard/ergodox_ez/keymaps/ordinary/ordinary-base.png M keyboard/ergodox_ez/keymaps/ordinary/ordinary-base.txt M keyboard/ergodox_ez/keymaps/ordinary/ordinary-media.png M keyboard/ergodox_ez/keymaps/ordinary/ordinary-media.txt M keyboard/ergodox_ez/keymaps/ordinary/ordinary-symbol.png M keyboard/ergodox_ez/keymaps/ordinary/ordinary-symbol.txt M keyboard/ergodox_ez/keymaps/ordinary/ordinary.hex M keyboard/ergodox_ez/keymaps/ordinary/readme.md M keyboard/ergodox_ez/keymaps/osx_de/keymap.c M keyboard/ergodox_ez/keymaps/osx_de/osx_de.hex M keyboard/ergodox_ez/keymaps/osx_de/osx_de_highres.png A keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx-hjkl/keymap.c A keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx-hjkl/readme.md A keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx-hjkl/romanzolotarev-norman-plover-osx-hjkl.hex A keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx-hjkl/romanzolotarev-norman-plover-osx-hjkl.png M keyboard/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/readme.md M keyboard/ergodox_ez/readme.md M keyboard/planck/keymaps/default/keymap.c A keyboard/planck/keymaps/nico.c M keyboard/planck/keymaps/tak3over.c M keyboard/preonic/Makefile M keyboard/preonic/keymaps/default/keymap.c M keyboard/preonic/keymaps/lock/keymap.c A keyboard/preonic/keymaps/nerdgasm/README.md A keyboard/preonic/keymaps/nerdgasm/keymap.c M keyboard/preonic/preonic.c M keyboard/preonic/preonic.h A keyboard/preonic/preonic_music.hex M quantum/audio.c M quantum/keymap_extras/keymap_german_osx.h M tmk_core/common/action.c M tmk_core/common/action.h M tmk_core/common/action_layer.c M tmk_core/common/action_layer.h