summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Use aliases where available. No firmware change.Olivier2016-04-171-6/+6
* Commit firmware up-to-date with latest upstream qmk_firmware changes.Olivier2016-04-171-972/+996
* Merge https://github.com/jackhumbert/qmk_firmwareOlivier2016-04-1753-1845/+4157
|\
| * planck default layout updatesJack Humbert2016-04-174-70/+130
| * no need for length of play_notes array with macroJack Humbert2016-04-167-61/+54
| |\
| | * Fixed how note arrays are used.IBNobody2016-04-165-47/+39
| | * Merge remote-tracking branch 'remotes/jackhumbert/master' into personal_atomi...IBNobody2016-04-165-23/+37
| | |\
| * | | Merge branch 'personal_atomic_planck' of github.com:IBNobody/qmk_firmwareJack Humbert2016-04-161-30/+139
| |\| |
| | * | Merging with QMK main to fix rest issuesIBNobody2016-04-161-30/+139
| | * | Merge remote-tracking branch 'remotes/jackhumbert/master' into personal_atomi...IBNobody2016-04-163-34/+36
| | |\ \
| * | | | changes to play_notes, goodbyeJack Humbert2016-04-166-22/+24
| | |_|/ | |/| |
| * | | rests between notes as an argumentJack Humbert2016-04-165-23/+37
| * | | Merge pull request #260 from IBNobody/personal_atomic_planckJack Humbert2016-04-169-55/+645
| |\| | | | |/ | |/|
| | * Adding Musical NotesIBNobody2016-04-1623-333/+1069
| | |\
| | * | Merging with QMK main to fix audio issuesIBNobody2016-04-161-5/+17
| | * | Corrected layer macrosIBNobody2016-04-151-9/+12
| | * | Tweaking PVC atomic layoutIBNobody2016-04-153-31/+39
| | * | Added Audio to my AtomicIBNobody2016-04-156-175/+297
| | * | Prepping for merge with new_defaultsIBNobody2016-04-158-76/+93
| | |\ \
| | * \ \ fixed mergingIBNobody2016-04-146-39/+205
| | |\ \ \
| | | * \ \ Merge remote-tracking branch 'remotes/jackhumbert/new_defaults'IBNobody2016-04-146-60/+202
| | | |\ \ \
| | | * | | | Rename pc.c to pvc_planck.cIBNobody2016-04-141-0/+0
| | | * | | | Update and rename pc_atomic.c to pvc_atomic.cIBNobody2016-04-141-6/+0
| | * | | | | adding new per-keymap makefileIBNobody2016-04-143-28/+73
| | * | | | | CheckinIBNobody2016-04-143-9/+169
| | * | | | | Adding personal build file settingsIBNobody2016-04-143-6/+6
| | * | | | | Merge remote-tracking branch 'refs/remotes/jackhumbert/master' into pc_atomic...IBNobody2016-04-140-0/+0
| | |\ \ \ \ \
| | * | | | | | Rename pc.c to pvc_planck.cIBNobody2016-04-141-0/+0
| | * | | | | | Update and rename pc_atomic.c to pvc_atomic.cIBNobody2016-04-141-6/+0
| | * | | | | | Remapped magic bootloader key to B.IBNobody2016-04-141-1/+1
| | * | | | | | NightlyIBNobody2016-04-141-18/+53
| | | |/ / / / | | |/| | | |
| * | | | | | fixes audio prescaler to emit correct freqJack Humbert2016-04-163-34/+36
| | |_|_|_|/ | |/| | | |
| * | | | | readme clarity for rgbledsJack Humbert2016-04-161-1/+7
| * | | | | MAGIC functionality, AG swap in default layoutJack Humbert2016-04-1610-161/+226
| * | | | | Merge branch 'master' of https://github.com/jackhumbert/tmk_keyboardJack Humbert2016-04-161-0/+112
| |\ \ \ \ \
| | * \ \ \ \ Merge pull request #257 from VoodaGod/bone2planckJack Humbert2016-04-161-0/+112
| | |\ \ \ \ \
| | | * | | | | My Attempt at adapting the Bone2 layout with Neo2 navigation cluster & number...Jason Janse van Rensburg2016-04-161-0/+112
| * | | | | | | updates to preonic default, music mode integratedJack Humbert2016-04-162-95/+165
| |/ / / / / /
| * | | | | | added keymap_extras to pathJack Humbert2016-04-161-0/+1
| * | | | | | new defaults for planck and preonicJack Humbert2016-04-165-117/+308
| * | | | | | eeprom reset toolJack Humbert2016-04-162-0/+15
| * | | | | | audio on by defaultJack Humbert2016-04-151-1/+1
| * | | | | | audio enable stored in eepromJack Humbert2016-04-157-10/+89
| |/ / / / /
| * | | | | Merge pull request #256 from jackhumbert/new_defaultsJack Humbert2016-04-1511-64/+233
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | [Erez & Jack] Documents tri-layer and keymap-specific makefile optionsErez Zukerman2016-04-071-1/+13
| | * | | | [Erez & Jack] Makes tri-layer available across QuantumErez Zukerman2016-04-073-9/+12
| | | |_|/ | | |/| |
| | * | | audio note length fixesJack Humbert2016-04-153-30/+33
| | * | | the spacessssJack Humbert2016-04-155-47/+60
| | * | | bootmagic somehow not getting enabled, so adding eeconfig to backlight src in...Jack Humbert2016-04-143-10/+5
| | * | | might have broken somethingJack Humbert2016-04-142-3/+4
| | | |/ | | |/|