qmk_firmware.git - Unnamed repository; edit this file 'description' to name the repository.

	Commit message (Collapse)	Author	Age
...
\| * \| \| \| \|	Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware	Stephan Bösebeck	2016-03-28
\| \|\ \ \ \ \ \| \| \| \|/ / / \| \| \|/\| \| \|
\| \| * \| \| \|	Merge pull request #216 from msc654/master	Erez Zukerman	2016-03-28
\| \| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added msc keymap for ergodox_ez
\| \| \| * \| \| \|	Corrected duplicate image issue	Matthew Carroll	2016-03-28
\| \| \| \| \| \| \|
\| \| \| * \| \| \|	Added msc keymap for ergodox_ez	Matthew Carroll	2016-03-27
\| \| \| \| \|_\|/ \| \| \| \|/\| \|
\| \| * \| \| \|	Merge pull request #214 from cdlm/action-hook	Jack Humbert	2016-03-28
\| \| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add per-event user hook function
\| \| \| * \| \| \|	Add action-preprocessing kb/user hooks in planck	Damien Pollet	2016-03-28
\| \| \| \|/ / /
\| \| * / / /	Magic Key Overrides / Keyboard Lock / Forced NKRO	IBNobody	2016-03-28
\| \| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added Magic Key Overrides / Magic Key Cleanup / Added Keyboard Lock option to template / Added forced NKRO option to template (disabled by default)
\| * \| \| \|	minor changes	Stephan Bösebeck	2016-03-24
\| \| \| \| \|
\| * \| \| \|	Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware	Stephan Bösebeck	2016-03-24
\| \|\ \ \ \
\| * \ \ \ \	Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware	Stephan Bösebeck	2016-03-22
\| \|\ \ \ \ \
\| * \| \| \| \| \|	fix number pad, add ,	Stephan Bösebeck	2016-03-20
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	changing cursor keys, back to "default" cursor key layout, adding ISO-cursor ↵	Stephan Bösebeck	2016-03-20
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	keys to Symb layer. Changed numbers back to symmetric layout again, keeping F-keys in symb though
\| * \| \| \| \| \|	tweaking it a bit further, fixing things	Stephan Bösebeck	2016-03-20
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware	Stephan Bösebeck	2016-03-20
\| \|\ \ \ \ \ \
\| * \ \ \ \ \ \	Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware	Stephan Bösebeck	2016-03-08
\| \|\ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	forgot F6	Stephan Bösebeck	2016-03-02
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	updated version, changed F-Key-Layout, minor change in code layer	Stephan Bösebeck	2016-03-02
\| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \|	Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware	Stephan Bösebeck	2016-03-02
\| \|\ \ \ \ \ \ \ \
\| * \| \| \| \| \| \| \| \|	testing moving the 6 to the left, having one key more on the right used for ↵	Stephan Bösebeck	2016-02-15
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	hash now feels a bit more natural to me. Need to investigate further.
* \| \| \| \| \| \| \| \| \|	Updated hex	Alex Johnstone	2016-03-28
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	££££	Alex Johnstone	2016-03-28
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Forgot to change ent/spc	Alex Johnstone	2016-03-28
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Didn't	Alex Johnstone	2016-03-28
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Fixed issues, added unicode layer ⌬ ¯\_⩾ツ⩽_/¯	Alex Johnstone	2016-03-27
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge pull request #4 from jackhumbert/master	Alex Johnstone	2016-03-27
\|\ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \| \| \|	upstream
\| * \| \| \| \| \| \| \| \|	Merge pull request #211 from nrrkeene/master	Erez Zukerman	2016-03-27
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The Ordinary Layout is unremarkably mundane and remarkably useful
\| \| * \ \ \ \ \ \ \ \	Merge https://github.com/jackhumbert/qmk_firmware	Nicholas Keene	2016-03-26
\| \| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \|_\|_\|_\|_\|_\|_\|/ \| \| \| \|/\| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \|	The Ordinary Layout is unremarkably mundane and remarkably useful	Nicholas Keene	2016-03-26
\| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \|	The Ordinary Layout is familiar to users of common keyboards	Nicholas Keene	2016-03-24
\| \| \| \|_\|_\|_\|_\|_\|/ / \| \| \|/\| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Merge pull request #196 from naps62/naps62	Erez Zukerman	2016-03-27
\| \|\ \ \ \ \ \ \ \ \ \| \| \|_\|/ / / / / / / \| \|/\| \| \| \| \| \| \| \|	Adds naps62's Ergodox EZ layout
\| \| * \| \| \| \| \| \| \|	Adds naps62's layout	Miguel Palhas	2016-03-15
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Fixed issues, added unicode layer ⌬ ¯\_⩾ツ⩽_/¯	Alex Johnstone	2016-03-27
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge pull request #3 from jackhumbert/master	Alex Johnstone	2016-03-25
\|\\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Pull upstream
\| * \| \| \| \| \| \| \| \|	Merge pull request #207 from romanzolotarev/master	Erez Zukerman	2016-03-25
\| \|\ \ \ \ \ \ \ \ \ \| \| \|_\|/ / / / / / / \| \|/\| \| \| \| \| \| \| \|	Add important note about brightness on OS X
\| \| * \| \| \| \| \| \| \|	Add important note about brightness on OS X	Roman Zolotarev	2016-03-22
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Edited to work with jackhumbert/qmk_firmware pull #190	Norberto Monarrez	2016-03-23
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Basically changes "* matrix_scan_user(void)" to "matrix_scan_user(void)"
\| * \| \| \| \| \| \| \| \|	Merge pull request #209 from n0bs/master	Jack Humbert	2016-03-23
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Added project folder for Bantam-44
\| \| * \| \| \| \| \| \| \| \|	Added files for Bantam-44	Norberto Monarrez	2016-03-23
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Merge pull request #200 from alexives/add_diagram_to_planck_layout	Jack Humbert	2016-03-23
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \|	Added layout diagrams to the default planck keymap
\| \| * \| \| \| \| \| \| \| \|	Added layout diagrams to the default planck keymap	Alex Ives	2016-03-16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Signed-off-by: Alex Ives <alex@ives.mn>
\| * \| \| \| \| \| \| \| \| \|	Fixed LED Function Calls	IBNobody	2016-03-22
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fixed LED indicator function calls to match how the matrix init function calls are formatted.
\| * \| \| \| \| \| \| \| \| \|	Merge remote-tracking branch 'refs/remotes/jackhumbert/master'	IBNobody	2016-03-22
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	# Conflicts: # quantum/template/template.c # quantum/template/template.h
\| \| * \ \ \ \ \ \ \ \ \	Pull request 190 resolution with 'qmk/master' for merge	yoyoerx	2016-03-21
\| \| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \|_\|_\|_\|_\|_\|_\|/ / \| \| \| \|/\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \|	PR190hotfix.sh, fresh hexes, makeallhex.sh script	yoyoerx	2016-03-11
\| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \|	Addressed void* return warning in all keymaps	yoyoerx	2016-03-10
\| \| \| \|_\|_\|_\|_\|_\|/ / / \| \| \|/\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Adding Retro_Refit Keyboard	IBNobody	2016-03-16
\| \| \|_\|/ / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Retro_Refit is an example of using a Teensy to replace a keyboard controller on an older keyboard. The original 6x15 keyboard had a non-standard 11x8 matrix.
* \| \| \| \| \| \| \| \| \|	New :pound: method	Alex Johnstone	2016-03-23
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	New :pound: method	Alex Johnstone	2016-03-23
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	New :pound: method	Alex Johnstone	2016-03-23
\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	New :pound: method	Alex Johnstone	2016-03-23
\| \| \| \| \| \| \| \| \| \|