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: 2e3834e 4321f0a)

author	Fred Sundvik <fsundvik@gmail.com>
	Thu, 25 Aug 2016 20:26:02 +0000 (23:26 +0300)
committer	Fred Sundvik <fsundvik@gmail.com>
	Thu, 25 Aug 2016 20:26:02 +0000 (23:26 +0300)
commit	523dff3005193f72247addff70c8cb238ac6164b
tree	43b0835c0dc3b59ad7366b8ae77acfb8e21fdc98	tree \| snapshot
parent	2e3834edea1bc2f83477dff1a423adc87c357471	commit \| diff
parent	4321f0af7d34f794a372964be49d225442671c45	commit \| diff

Merge branch 'master' into makefile_overhaul

keyboards/gh60/rules.mk	diff1 \|	\|	blob \| history
keyboards/kc60/Makefile	diff1 \|	diff2 \|	blob \| history
keyboards/kc60/readme.md	diff1 \|	diff2 \|	blob \| history
keyboards/kitten_paw/rules.mk	diff1 \|	\|	blob \| history
lib/googletest	\|	\|	blob
readme.md	diff1 \|	diff2 \|	blob \| history

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