]> git.donarmstrong.com Git - qmk_firmware.git/commitdiff
projects / qmk_firmware.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bcb0457 6001a93)
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)
Conflicts:
keyboard/planck/PCB_GUIDE.md


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.