summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareChristopher Browne2016-01-312-29/+163
|\
| * Merge pull request #118 from sboesebeck/masterErez Zukerman2016-01-312-29/+163
| |\ | | | | | | created new layer for egosooters like counterstrike
| | * some fixes in readmeStephan Bösebeck2016-01-311-2/+3
| | |
| | * Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck2016-01-3111-1466/+2238
| | |\ | | |/ | |/|
| | * fixed some copy paste errorsStephan Bösebeck2016-01-291-2/+2
| | |
| | * added a egoshooter layerStephan Bösebeck2016-01-291-4/+58
| | |
| | * Merge branch 'master' of https://github.com/sboesebeck/qmk_firmwareStephan Bösebeck2016-01-290-0/+0
| | |\
| | | * Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck2016-01-286-0/+1718
| | | |\
| | * | \ Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck2016-01-296-0/+1718
| | |\ \ \ | | | |/ / | | |/| / | | | |/
| | * | added new macrosStephan Bösebeck2016-01-281-1/+27
| | | |
| | * | playing more with cursor keysStephan Bösebeck2016-01-281-1/+1
| | | |
| | * | playing a bit with cursor keysStephan Bösebeck2016-01-281-23/+76
| | | |
| | * | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck2016-01-281-0/+149
| | |\ \
| | * \ \ Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck2016-01-254-0/+1671
| | |\ \ \
| | * \ \ \ Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck2016-01-2513-19/+1064
| | |\ \ \ \
| | * | | | | typo fixStephan Bösebeck2016-01-241-1/+1
| | | | | | |
* | | | | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareChristopher Browne2016-01-3011-1466/+2238
|\| | | | | |
| * | | | | | Merge pull request #117 from coderkun/masterErez Zukerman2016-01-303-1466/+1681
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Merge changes for coderkun’s Neo2 layout
| | * | | | | | add build instructions to readmecoderkun2016-01-301-2/+17
| | | | | | | |
| | * | | | | | correct link and some minor details in readme filecoderkun2016-01-301-3/+3
| | | | | | | |
| | * | | | | | add readme file for coderkun’s Neo2 layoutcoderkun2016-01-301-0/+16
| | | | | | | |
| | * | | | | | Merge remote-tracking branch 'upstream/master'coderkun2016-01-308-0/+557
| | |\ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Merge pull request #115 from seancaffery/sean/atreusJack Humbert2016-01-296-0/+510
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Add Teensy2 Atreus support
| | * | | | | | | Add Teensy2 Atreus supportSean Caffery2016-01-306-0/+510
| | | | | | | | |
| * | | | | | | | audio on resetJack Humbert2016-01-291-0/+17
| |/ / / / / / /
| * | | | | | / missing fileJack Humbert2016-01-291-0/+30
| | |_|_|_|_|/ | |/| | | | |
| | * | | | | add layers for poor man’s QWERTZ and poor man’s Neo including Neo’s ↵coderkun2016-01-302-1466/+1650
| |/ / / / / | | | | | | | | | | | | | | | | | | layer 4
* | | | | | More notesChristopher Browne2016-01-291-1/+1
| | | | | |
* | | | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareChristopher Browne2016-01-296-0/+1718
|\| | | | |
| * | | | | Merge pull request #113 from chschmitz/masterErez Zukerman2016-01-286-0/+1718
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | | New German layout for ErgoDox, similar to Kinesis Ergo Elan and regular German keyboards
| | * | | | Added .hex file.Christoph Schmitz2016-01-281-0/+1473
| | | | | |
| | * | | | Fixed graphics.Christoph Schmitz2016-01-281-0/+0
| | | | | |
| | * | | | Added media layer.Christoph Schmitz2016-01-282-0/+4
| | | | | |
| | * | | | Added links.Christoph Schmitz2016-01-281-1/+7
| | | | | |
| | * | | | Added documentation.Christoph Schmitz2016-01-283-0/+25
| | | | | |
| | * | | | Made all layer change keys momentary. Removed Hyper and Meh in favor of ↵Christoph Schmitz2016-01-281-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | layer 1 and 2 on both halves.
| | * | | | Switched up and down keys to be closer to the vi etc. world.Christoph Schmitz2016-01-271-2/+2
| | | | | |
| | * | | | Fixed circonflex key.Christoph Schmitz2016-01-271-1/+3
| | | | | |
| | * | | | Fixed regarding Ctrl and Alt keys.Christoph Schmitz2016-01-271-4/+4
| | | | | |
| | * | | | Added a German layout inspired by the Kinesis Ergo Elan and based on the ↵Christoph Schmitz2016-01-271-0/+208
| |/ / / / | | | | | | | | | | | | | | | "german" keymap.
* | | | | On Linux, run dfu-programmer as rootChristopher Browne2016-01-291-0/+4
| | | | |
* | | | | Notes on what's done, and plans to change my key mappingChristopher Browne2016-01-291-0/+11
| | | | |
* | | | | Notes on what's done, and plans to change my key mappingChristopher Browne2016-01-291-0/+19
| | | | |
* | | | | Bunch of reformatting, improvements to commentsChristopher Browne2016-01-291-19/+22
| | | | |
* | | | | Latest version of cbbrowne key mapsChristopher Browne2016-01-292-14/+37
| | | | |
* | | | | Added in a keypad layer that replaces DvorakChristopher Browne2016-01-281-0/+100
|/ / / /
* | | | Merge pull request #110 from mollat/masterJack Humbert2016-01-261-0/+149
|\ \ \ \ | |_|_|/ |/| | | add mollat keymap
| * | | add mollat keymapAM2016-01-261-0/+149
|/ / /
* | | Merge pull request #109 from petereichinger/masterJack Humbert2016-01-251-0/+11
|\ \ \ | | | | | | | | Fix flickering when sleeping
| * \ \ Merge branch 'master' into flicker-fixPeter Eichinger2016-01-2562-566/+7863
| |\ \ \ | |/ / / |/| | |