summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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 pull request #110 from mollat/masterJack Humbert2016-01-261-0/+149
| |\
| | * add mollat keymapAM2016-01-261-0/+149
| |/
* | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck2016-01-254-0/+1671
|\|
| * Merge pull request #109 from petereichinger/masterJack Humbert2016-01-251-0/+11
| |\
| | * Merge branch 'master' into flicker-fixPeter Eichinger2016-01-2562-566/+7863
| | |\ | | |/ | |/|
| * | Merge pull request #107 from tonyabra/config/tonyabra-osxErez Zukerman2016-01-253-0/+1660
| |\ \
| | * | Simplified osx layout for ergodox eztonyabra2016-01-243-0/+1660
| |/ /
| | * Remove led_off() it is not usedPeter Eichinger2016-01-241-2/+0
| | * Backlight fix from redditPeter Eichinger2016-01-221-0/+13
* | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck2016-01-2513-19/+1064
|\| |
| * | Merge pull request #106 from yangliu/planck-rgbJack Humbert2016-01-2413-19/+1064
| |\ \
| | * | no messageYang Liu2016-01-241-2/+2
| | * | Update READMEYang Liu2016-01-241-11/+41
| | * | add one more photoYang Liu2016-01-241-0/+0
| | * | Add a photo for the demonstration of RGB underflowYang Liu2016-01-241-0/+0
| | * | fix bugs in animation effectsYang Liu2016-01-242-2/+2
| | * | Integrate WS2812 code into quantum coreYang Liu2016-01-247-15/+8
| | * | Add support for WS2812 LEDsYang Liu2016-01-249-7/+1029
| |/ /
* / / typo fixStephan Bösebeck2016-01-241-1/+1
|/ /
* | Makefile back to defaultsJack Humbert2016-01-231-3/+3
* | changes to the templateJack Humbert2016-01-236-85/+15
* | not sure how this got here..Jack Humbert2016-01-231-78/+0
* | Merge pull request #104 from jackhumbert/smarkefileJack Humbert2016-01-2334-441/+958
|\ \
| * | rename fileJack Humbert2016-01-231-42/+0
| * | Merge branch 'audio' of https://github.com/jackhumbert/tmk_keyboard into smar...Jack Humbert2016-01-2317-350/+840
| |\ \
| | * \ Merge branch 'master' of https://github.com/jackhumbert/tmk_keyboard into audioJack Humbert2016-01-2385-4438/+30696
| | |\ \ | |_|/ / |/| | |
| | * | better integrationsJack Humbert2016-01-2011-329/+402
| | * | soundsJack Humbert2016-01-152-2/+4
| | * | note seq, start-up beeps, function beepsJack Humbert2016-01-133-46/+183
| | * | beeps on lock keymapJack Humbert2016-01-112-30/+31
| | * | timer 3Jack Humbert2016-01-112-151/+18
| | * | pwm audioJack Humbert2016-01-1113-183/+593
| * | | Merge branch 'master' of https://github.com/jackhumbert/tmk_keyboard into sma...Jack Humbert2016-01-2371-1539/+25926
| |\ \ \ | |/ / / |/| | |
* | | | starting the hand-wiring guideJack Humbert2016-01-231-0/+323
* | | | Merge pull request #102 from sboesebeck/masterErez Zukerman2016-01-233-84/+385
|\ \ \ \
| * \ \ \ Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck2016-01-237-0/+3599
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Merge pull request #97 from DidierLoiseau/typematrixErez Zukerman2016-01-233-0/+1938
|\ \ \ \ \
| * | | | | Fixed rendering of the Layer Switching sectionDidierLoiseau2016-01-231-1/+2
| * | | | | Fixed small issues in README.mdDidierLoiseau2016-01-231-28/+30
| * | | | | Added keymap.hexDidier Loiseau2016-01-231-0/+1544
| * | | | | Moved layout description to README.md and added more detailsDidier Loiseau2016-01-232-25/+134
| * | | | | Added Calculator, Mail and Browser Home application keys.Didier Loiseau2016-01-231-3/+3
| * | | | | Renamed "Numbers Layer" to "Numeric Layer"Didier Loiseau2016-01-231-10/+10
| * | | | | Implemented new folders structure.Didier Loiseau2016-01-231-0/+0
| * | | | | Merge remote-tracking branch 'jackhumbert/master' into typematrixDidier Loiseau2016-01-2380-4409/+28105
| |\ \ \ \ \ | |/ / / / / |/| | | | |
* | | | | | Merge pull request #100 from RageZBla/colemakErez Zukerman2016-01-233-0/+1659
|\ \ \ \ \ \
| * | | | | | Add colemak keymap to Ergodox EZ.Olivier Lechevalier2016-01-233-0/+1659
|/ / / / / /