From: Stephen Tudor <smt@smt.io>
Date: Sat, 28 Jan 2017 05:51:07 +0000 (-0500)
Subject: Merge branch 'master' into smt/planck
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=fa72689145ccbee120c236111c0e8813afa7881a;p=qmk_firmware.git

Merge branch 'master' into smt/planck

* master:
  Clarify license on abnt2 keymap (#1038)
  replace jackhumbert with qmk
  Add gitter image, start update to qmk org
  Remove COLEMAK from preonic_keycodes enum
  layer defines to enum
  Update readme for smt Preonic keymap
  Add smt keymap for Preonic
  updated all the other keymaps to support the new changes.
  fix: infinity60 keyboard was not using quantum features.
  Compare Makefile with itself instead of using `--help`
---

fa72689145ccbee120c236111c0e8813afa7881a