summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* merging in #262Jack Humbert2016-04-183-254/+377
|\
| * Merge pull request #262 from IBNobody/masterJack Humbert2016-04-1813-324/+599
| |\
| | * Merge pull request #2 from IBNobody/personal_atomic_planckIBNobody2016-04-182-226/+248
| | |\
| | | * Fixed speaker being on during sleep.IBNobody2016-04-182-226/+248
| | |/
| | * Merge remote-tracking branch 'refs/remotes/origin/personal_atomic_planck'IBNobody2016-04-1846-575/+2373
| | |\
| | | * Added CM/DKIBNobody2016-04-181-96/+202
| | | * Merge remote-tracking branch 'refs/remotes/jackhumbert/master' into personal_...IBNobody2016-04-173-5/+9
| | | |\ | | |_|/ | |/| |
| | | * Notes BugfixIBNobody2016-04-172-38/+33
* | | | note sliding - on right nowJack Humbert2016-04-183-45/+63
* | | | audio fixesJack Humbert2016-04-171-2/+2
* | | | Merge branch 'personal_atomic_planck' of github.com:IBNobody/qmk_firmwareJack Humbert2016-04-1712-194/+346
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | Added extra songs, LED indicator notesIBNobody2016-04-1712-194/+346
* | | Merge branch 'master' of https://github.com/jackhumbert/tmk_keyboardJack Humbert2016-04-171-0/+1
|\ \ \
| * \ \ Merge pull request #261 from a0-c/masterJack Humbert2016-04-171-0/+1
| |\ \ \
| | * | | __attribute__ ((weak)) added to led_seta0-c2016-04-171-0/+1
| |/ / /
* | | | mergingJack Humbert2016-04-1711-56/+64
|\ \ \ \ | | |/ / | |/| |
| * | | Converted goodbye to notes, fixed eighth dotted note macroIBNobody2016-04-175-11/+15
| * | | Merge remote-tracking branch 'remotes/jackhumbert/master' into personal_atomi...IBNobody2016-04-178-87/+150
| |\| |
| * | | Fixed many compiler warnings related to print being disabledIBNobody2016-04-178-45/+50
| * | | fixed single note play copy/paste bugIBNobody2016-04-171-1/+1
* | | | audio fixesJack Humbert2016-04-173-5/+9
* | | | Merge branch 'personal_atomic_planck' of github.com:IBNobody/qmk_firmwareJack Humbert2016-04-176-210/+293
|\| | | | |/ / |/| |
| * | Added trimble and tempo adjustments!IBNobody2016-04-176-110/+189
| * | Adding folding to #if, etcIBNobody2016-04-174-170/+174
* | | 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