| Commit message (Expand) | Author | Age | Files | Lines |
* | having trouble with conflicts | climbalima | 2016-12-03 | 1 | -2/+0 |
* | Merge https://github.com/climbalima/qmk_firmware | climbalima | 2016-12-03 | 1 | -21/+1 |
|\ |
|
| * | changed readme | climbalima | 2016-11-19 | 1 | -0/+2 |
* | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | climbalima | 2016-12-03 | 1 | -1/+25 |
|\| |
|
| * | fixed readme conflicts | climbalima | 2016-11-16 | 1 | -20/+2 |
* | | just saving | climbalima | 2016-11-18 | 1 | -25/+6 |
|/ |
|
* | Merge https://github.com/climbalima/qmk_firmware | climbalima | 2016-11-16 | 1 | -0/+18 |
|\ |
|
| * | Changes to be committed: | climbalima | 2016-11-10 | 1 | -0/+28 |
* | Updated my repo to current qmk | climbalima | 2016-11-16 | 1 | -0/+28 |