summaryrefslogtreecommitdiffstats
path: root/keyboard
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck2016-04-1713-263/+776
|\
| * planck default layout updatesJack Humbert2016-04-172-64/+123
| * no need for length of play_notes array with macroJack Humbert2016-04-163-50/+19
| |\
| | * Fixed how note arrays are used.IBNobody2016-04-161-35/+9
| | * Merge remote-tracking branch 'remotes/jackhumbert/master' into personal_atomi...IBNobody2016-04-162-13/+13
| | |\
| * | | 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-161-26/+26
| | |\ \
| * | | | changes to play_notes, goodbyeJack Humbert2016-04-164-14/+14
| | |_|/ | |/| |
| * | | rests between notes as an argumentJack Humbert2016-04-162-13/+13
| * | | Merge pull request #260 from IBNobody/personal_atomic_planckJack Humbert2016-04-167-55/+462
| |\| | | | |/ | |/|
| | * Adding Musical NotesIBNobody2016-04-167-164/+494
| | |\
| | * | 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-155-173/+295
| | * | Prepping for merge with new_defaultsIBNobody2016-04-153-50/+63
| | |\ \
| | * \ \ fixed mergingIBNobody2016-04-143-20/+186
| | |\ \ \
| | | * \ \ Merge remote-tracking branch 'remotes/jackhumbert/new_defaults'IBNobody2016-04-143-41/+183
| | | |\ \ \
| | | * | | | 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-142-9/+168
| | * | | | | Adding personal build file settingsIBNobody2016-04-143-6/+6
| | * | | | | 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-161-26/+26
| | |_|_|/ | |/| | |
| * | | | MAGIC functionality, AG swap in default layoutJack Humbert2016-04-163-42/+11
* | | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck2016-04-169-130/+641
|\| | | |
| * | | | 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-161-50/+110
| |/ / / / /
| * | | | | new defaults for planck and preonicJack Humbert2016-04-165-117/+308
| * | | | | audio enable stored in eepromJack Humbert2016-04-153-8/+15
| |/ / / /
| * | | / [Erez & Jack] Makes tri-layer available across QuantumErez Zukerman2016-04-071-9/+0
| | |_|/ | |/| |
| * | | audio note length fixesJack Humbert2016-04-151-23/+23
| * | | the spacessssJack Humbert2016-04-152-28/+41
| * | | bootmagic somehow not getting enabled, so adding eeconfig to backlight src in...Jack Humbert2016-04-142-10/+4
| * | | might have broken somethingJack Humbert2016-04-142-3/+4
| | |/ | |/|
| * | changing up the makefile a bitJack Humbert2016-04-143-41/+65
| * | new defaultsJack Humbert2016-04-142-15/+133
| |/
* | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck2016-04-149-106/+577
|\|
| * Disabled print.IBNobody2016-04-131-2/+2
| * Corrected spacing.IBNobody2016-04-131-11/+11
| * Corrected spacing.IBNobody2016-04-131-13/+15
| * Compiler Warnings / Atomic TLCIBNobody2016-04-136-28/+105
| * Merge remote-tracking branch 'refs/remotes/jackhumbert/master' into pc_planckIBNobody2016-04-1339-2647/+10816
| |\