Referencing the hex file (#309)

Seems that this is a typo. When I used the hex file it worked so presuming that means it's right ;)

updates atreus's column mapping

Merge pull request #305 from nrrkeene/master

Custom handling for shift keys, improved media layer

Merge pull request #304 from adiabatic/ergodox-zweihander-osx

zweihander: comment out action_get_macro()

zweihander: comment out action_get_macro()

The Ordinary Layout is arranged as close as possible to a traditional keyboard, but with extra special features

The Ordinary Layout works the way you expect it to, with extra powerful features

Clarified audio.c (#302)

* Updated personal layouts

* tweaked personal

* Nightly - Audio Cleanup

Refactored the LUTs. Abstracted some of the registers out of audio to
use more functional names. Split audio into audio and audio_pwm. WIP

* nightly - collapsed code

* Added check for note playing to LEDs

Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware

Merge pull request #300 from Twey/tweymap-momentary

Swap steno/media layers to allow using media keys in the Plover layer…

Swap steno/media layers to allow using media keys in the Plover layer; display all active layers, not just the top; use only momentary modifiers

Merge pull request #298 from adiabatic/ergodox-zweihander-osx

ergodox-zweihander-osx: initial commit

Merge pull request #294 from sneako/master

Add my Ergodox EZ config

Merge pull request #258 from romanzolotarev/master

Add Roman's single layer layout based on Norman

The Ordinary Layout is the layout you are looking for. Come and see v3.14.

zweihander: move dim/brighten to 1/2, add ⌘Q

zweihander: Add ⌘`, ⌘⇧`, ⌥⇥, ⌥⇧⇥

Ergodox EZ:  add zweihander-osx.hex

ergodox-zweihander: initial commit

Merge pull request #292 from abperiasamy/ergo-ab

Beginner's keymap for Ergodox-EZ