summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | Merge remote-tracking branch 'upstream/master'xyverz2016-12-1322-58/+548
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Changesxyverz2016-12-133-133/+70
| * | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/master'xyverz2016-12-06159-2209/+12520
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master'xyverz2016-11-191-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'upstream/master'xyverz2016-11-16151-917/+7753
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Updates to keymap file.xyverz2016-10-311-9/+57
| * | | | | | | | | | | | | | | | | Removed files that weren't supposed to be uploaded from gh60 keymap folderxyverz2016-10-312-122/+0
| * | | | | | | | | | | | | | | | | Adding more keymaps.xyverz2016-10-314-0/+331
| * | | | | | | | | | | | | | | | | Add files via uploadXyverz2016-10-181-2/+2
| * | | | | | | | | | | | | | | | | Add files via uploadXyverz2016-10-181-6/+6
| * | | | | | | | | | | | | | | | | Add files via uploadXyverz2016-10-182-10/+10
| * | | | | | | | | | | | | | | | | Merge remote-tracking branch 'jackhumbert/master'xyverz2016-09-3091-1480/+4262
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | More standardization between the three layoutsxyverz2016-09-301-6/+6
| * | | | | | | | | | | | | | | | | | revisions to my keymap again.Xyverz2016-09-301-8/+8
| * | | | | | | | | | | | | | | | | | Updates to my Planck keymap - standardizing the bottom row.Xyverz2016-09-301-4/+4
| * | | | | | | | | | | | | | | | | | Update readme.mdXyverz2016-09-171-1/+1
| * | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/master'xyverz2016-09-163-6/+9
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | removed a couple of mod_tap keys since they had some unintended conseqeunces ...xyverz2016-09-161-1/+1
* | | | | | | | | | | | | | | | | | | | Merge pull request #1198 from iamschaefer/patch-1Jack Humbert2017-04-021-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Update readme.mdAlexander Schaefer2017-04-021-1/+1
|/ / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | Merge pull request #1132 from akatrevorjay/pr/dfu-serialJack Humbert2017-03-311-1/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Allow to specify serial to dfu-util flashTrevor Joynson (trevorj)2017-03-021-1/+6
* | | | | | | | | | | | | | | | | | | | Merge pull request #1190 from osamuaoki/masterJack Humbert2017-03-311-7/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | Fix typoOsamu Aoki2017-04-011-7/+7
* | | | | | | | | | | | | | | | | | | | | Merge pull request #1189 from Zay950/to_pushJack Humbert2017-03-3113-0/+1278
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Worked around some new Makefile issues.nielsenz2017-03-309-56/+58
| * | | | | | | | | | | | | | | | | | | | Pulling and pushing troublesnielsenz2017-03-302-75/+15
| * | | | | | | | | | | | | | | | | | | | changed hotkey cluster to accomodate awkward software... againCallum Oakley2017-03-301-1/+1
| * | | | | | | | | | | | | | | | | | | | changed hotkey cluster to accomodate awkward softwareCallum Oakley2017-03-301-7/+7
| * | | | | | | | | | | | | | | | | | | | Add RN42 Bluetooth module supportTravis La Marr2017-03-304-2/+43
| * | | | | | | | | | | | | | | | | | | | Update to match QMK keymapOsamu Aoki2017-03-301-89/+143
| * | | | | | | | | | | | | | | | | | | | Typo fixOsamu Aoki2017-03-301-1/+1
| * | | | | | | | | | | | | | | | | | | | Merge branch 'master' into to_pushZay9502017-03-29743-7061/+63741
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | Missed removing a functionZach Nielsen2016-11-102-46/+0
| * | | | | | | | | | | | | | | | | | | | | Removed some common functions from my keymapnielsenz2016-11-104-24/+6
| * | | | | | | | | | | | | | | | | | | | | Missed some stuff. Added a song (stole it from reddit).Zach Nielsen2016-11-106-122/+19
| * | | | | | | | | | | | | | | | | | | | | Adding my (zach) keymaps for planck and preonicZach Nielsen2016-11-108-0/+1422
| * | | | | | | | | | | | | | | | | | | | | Keep unicode's input_mode through a power cycleZach Nielsen2016-11-102-0/+7
* | | | | | | | | | | | | | | | | | | | | | Merge pull request #1188 from hot-leaf-juice/masterJack Humbert2017-03-301-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | changed hotkey cluster to accomodate awkward software... againCallum Oakley2017-03-301-1/+1
* | | | | | | | | | | | | | | | | | | | | | | Merge pull request #1187 from hot-leaf-juice/masterJack Humbert2017-03-301-7/+7
|\| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | changed hotkey cluster to accomodate awkward softwareCallum Oakley2017-03-301-7/+7
| | |/ / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | Merge pull request #1185 from exiva/rn42_bluetoothJack Humbert2017-03-304-2/+43
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | Add RN42 Bluetooth module supportTravis La Marr2017-03-294-2/+43
| |/ / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | Merge pull request #1184 from osamuaoki/masterJack Humbert2017-03-302-90/+144
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Update to match QMK keymapOsamu Aoki2017-03-301-89/+143
| * | | | | | | | | | | | | | | | | | | | | Typo fixOsamu Aoki2017-03-301-1/+1
* | | | | | | | | | | | | | | | | | | | | | Merge pull request #1183 from Rovanion/real-masterJack Humbert</