| Commit message (Expand) | Author | Age | Files | Lines |
* | having trouble with conflicts | climbalima | 2016-12-03 | 1 | -15/+0 |
* | Merge https://github.com/climbalima/qmk_firmware | climbalima | 2016-12-03 | 1 | -0/+22 |
|\ |
|
| * | added the pinout for pro micro into maxipad | climbalima | 2016-11-19 | 1 | -3/+9 |
* | | just saving | climbalima | 2016-11-18 | 1 | -94/+19 |
|/ |
|
* | should have fixed conflixed | climbalima | 2016-11-16 | 1 | -7/+2 |
* | Merge https://github.com/climbalima/qmk_firmware | climbalima | 2016-11-16 | 1 | -0/+6 |
|\ |
|
| * | Changes to be committed: | climbalima | 2016-11-10 | 1 | -0/+162 |
* | Updated my repo to current qmk | climbalima | 2016-11-16 | 1 | -0/+162 |