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

	Commit message (Expand)	Author	Age
*	having trouble with conflicts	climbalima	2016-12-03
*	Merge https://github.com/climbalima/qmk_firmware	climbalima	2016-12-03
\|\
\| *	changed readme	climbalima	2016-11-19
\| *	added the pinout for pro micro into maxipad	climbalima	2016-11-19
* \|	Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware	climbalima	2016-12-03
\|\\|
\| *	fixed readme conflicts	climbalima	2016-11-16
* \|	just saving	climbalima	2016-11-18
\|/
*	should have fixed conflixed	climbalima	2016-11-16
*	Merge https://github.com/climbalima/qmk_firmware	climbalima	2016-11-16
\|\
\| *	Changes to be committed:	climbalima	2016-11-10
*	Updated my repo to current qmk	climbalima	2016-11-16