git.donarmstrong.com Git - qmk_firmware.git/commit

]> git.donarmstrong.com Git - qmk_firmware.git/commit

projects / qmk_firmware.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 3993afb d4f90fe)

author	IBNobody <ibnobody@gmail.com>
	Fri, 15 Apr 2016 03:33:18 +0000 (22:33 -0500)
committer	IBNobody <ibnobody@gmail.com>
	Fri, 15 Apr 2016 03:33:18 +0000 (22:33 -0500)
commit	66c1024bd328b687fba0645f70469094e75d624c
tree	c1d029247857cbbdff7c598129e8b5aa84500261	tree \| snapshot
parent	3993afbb2e022f4e6371c729ac6a025f16bc734e	commit \| diff
parent	d4f90fe882b33a99fd94e1befdf21323293e71ea	commit \| diff

fixed merging

keyboard/planck/Makefile

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