]> git.donarmstrong.com Git - qmk_firmware.git/commit
Merge branch 'master' of github.com:jackhumbert/tmk_keyboard
authorcr3473 <joe@createtank.com>
Tue, 2 Jun 2015 21:04:05 +0000 (14:04 -0700)
committercr3473 <joe@createtank.com>
Tue, 2 Jun 2015 21:04:05 +0000 (14:04 -0700)
commitf33d45f2004876469d8c1e989e99a149766cf4fc
tree6e0143d7e556fe174e096dbd46f748360ebe6018
parentbcb04570eaf80d3eeb89d79dec9336b47d65d622
parent6001a9347b1b782da14acb672d4a610bda0455eb
Merge branch 'master' of github.com:jackhumbert/tmk_keyboard

Conflicts:
keyboard/planck/PCB_GUIDE.md