Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/master' | xyverz | 2016-12-13 | 22 | -58/+548 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | Changes | xyverz | 2016-12-13 | 3 | -133/+70 | |
| * | | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/master' | xyverz | 2016-12-06 | 159 | -2209/+12520 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' | xyverz | 2016-11-19 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'upstream/master' | xyverz | 2016-11-16 | 151 | -917/+7753 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | Updates to keymap file. | xyverz | 2016-10-31 | 1 | -9/+57 | |
| * | | | | | | | | | | | | | | | | | Removed files that weren't supposed to be uploaded from gh60 keymap folder | xyverz | 2016-10-31 | 2 | -122/+0 | |
| * | | | | | | | | | | | | | | | | | Adding more keymaps. | xyverz | 2016-10-31 | 4 | -0/+331 | |
| * | | | | | | | | | | | | | | | | | Add files via upload | Xyverz | 2016-10-18 | 1 | -2/+2 | |
| * | | | | | | | | | | | | | | | | | Add files via upload | Xyverz | 2016-10-18 | 1 | -6/+6 | |
| * | | | | | | | | | | | | | | | | | Add files via upload | Xyverz | 2016-10-18 | 2 | -10/+10 | |
| * | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'jackhumbert/master' | xyverz | 2016-09-30 | 91 | -1480/+4262 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | More standardization between the three layouts | xyverz | 2016-09-30 | 1 | -6/+6 | |
| * | | | | | | | | | | | | | | | | | | revisions to my keymap again. | Xyverz | 2016-09-30 | 1 | -8/+8 | |
| * | | | | | | | | | | | | | | | | | | Updates to my Planck keymap - standardizing the bottom row. | Xyverz | 2016-09-30 | 1 | -4/+4 | |
| * | | | | | | | | | | | | | | | | | | Update readme.md | Xyverz | 2016-09-17 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | | | | | Merge remote-tracking branch 'upstream/master' | xyverz | 2016-09-16 | 3 | -6/+9 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | removed a couple of mod_tap keys since they had some unintended conseqeunces ... | xyverz | 2016-09-16 | 1 | -1/+1 | |
* | | | | | | | | | | | | | | | | | | | | Merge pull request #1198 from iamschaefer/patch-1 | Jack Humbert | 2017-04-02 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | Update readme.md | Alexander Schaefer | 2017-04-02 | 1 | -1/+1 | |
|/ / / / / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | | | Merge pull request #1132 from akatrevorjay/pr/dfu-serial | Jack Humbert | 2017-03-31 | 1 | -1/+6 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | Allow to specify serial to dfu-util flash | Trevor Joynson (trevorj) | 2017-03-02 | 1 | -1/+6 | |
* | | | | | | | | | | | | | | | | | | | | Merge pull request #1190 from osamuaoki/master | Jack Humbert | 2017-03-31 | 1 | -7/+7 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | Fix typo | Osamu Aoki | 2017-04-01 | 1 | -7/+7 | |
* | | | | | | | | | | | | | | | | | | | | | Merge pull request #1189 from Zay950/to_push | Jack Humbert | 2017-03-31 | 13 | -0/+1278 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | Worked around some new Makefile issues. | nielsenz | 2017-03-30 | 9 | -56/+58 | |
| * | | | | | | | | | | | | | | | | | | | | Pulling and pushing troubles | nielsenz | 2017-03-30 | 2 | -75/+15 | |
| * | | | | | | | | | | | | | | | | | | | | changed hotkey cluster to accomodate awkward software... again | Callum Oakley | 2017-03-30 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | | | | | | | changed hotkey cluster to accomodate awkward software | Callum Oakley | 2017-03-30 | 1 | -7/+7 | |
| * | | | | | | | | | | | | | | | | | | | | Add RN42 Bluetooth module support | Travis La Marr | 2017-03-30 | 4 | -2/+43 | |
| * | | | | | | | | | | | | | | | | | | | | Update to match QMK keymap | Osamu Aoki | 2017-03-30 | 1 | -89/+143 | |
| * | | | | | | | | | | | | | | | | | | | | Typo fix | Osamu Aoki | 2017-03-30 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | | | | | | | | Merge branch 'master' into to_push | Zay950 | 2017-03-29 | 743 | -7061/+63741 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | Missed removing a function | Zach Nielsen | 2016-11-10 | 2 | -46/+0 | |
| * | | | | | | | | | | | | | | | | | | | | | Removed some common functions from my keymap | nielsenz | 2016-11-10 | 4 | -24/+6 | |
| * | | | | | | | | | | | | | | | | | | | | | Missed some stuff. Added a song (stole it from reddit). | Zach Nielsen | 2016-11-10 | 6 | -122/+19 | |
| * | | | | | | | | | | | | | | | | | | | | | Adding my (zach) keymaps for planck and preonic | Zach Nielsen | 2016-11-10 | 8 | -0/+1422 | |
| * | | | | | | | | | | | | | | | | | | | | | Keep unicode's input_mode through a power cycle | Zach Nielsen | 2016-11-10 | 2 | -0/+7 | |
* | | | | | | | | | | | | | | | | | | | | | | Merge pull request #1188 from hot-leaf-juice/master | Jack Humbert | 2017-03-30 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | changed hotkey cluster to accomodate awkward software... again | Callum Oakley | 2017-03-30 | 1 | -1/+1 | |
* | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #1187 from hot-leaf-juice/master | Jack Humbert | 2017-03-30 | 1 | -7/+7 | |
|\| | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | changed hotkey cluster to accomodate awkward software | Callum Oakley | 2017-03-30 | 1 | -7/+7 | |
| | |/ / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | Merge pull request #1185 from exiva/rn42_bluetooth | Jack Humbert | 2017-03-30 | 4 | -2/+43 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | Add RN42 Bluetooth module support | Travis La Marr | 2017-03-29 | 4 | -2/+43 | |
| |/ / / / / / / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | | | | | | Merge pull request #1184 from osamuaoki/master | Jack Humbert | 2017-03-30 | 2 | -90/+144 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | Update to match QMK keymap | Osamu Aoki | 2017-03-30 | 1 | -89/+143 | |
| * | | | | | | | | | | | | | | | | | | | | | Typo fix | Osamu Aoki | 2017-03-30 | 1 | -1/+1 | |
* | | | | | | | | | | | | | | | | | | | | | | Merge pull request #1183 from Rovanion/real-master | Jack Humbert |