avr/qmk/firmware - [no description]

	Commit message (Expand)	Author	Age	Files	Lines
*	having trouble with conflicts	climbalima	2016-12-03	3	-20/+0
*	Merge https://github.com/climbalima/qmk_firmware	climbalima	2016-12-03	3	-22/+35
\|\
\| *	changed readme	climbalima	2016-11-19	2	-2/+3
\| *	added the pinout for pro micro into maxipad	climbalima	2016-11-19	2	-3/+10
* \|	Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware	climbalima	2016-12-03	1	-1/+25
\|\\|
\| *	fixed readme conflicts	climbalima	2016-11-16	1	-20/+2
* \|	just saving	climbalima	2016-11-18	10	-232/+54
\|/
*	should have fixed conflixed	climbalima	2016-11-16	3	-91/+3
*	Merge https://github.com/climbalima/qmk_firmware	climbalima	2016-11-16	4	-1/+108
\|\
\| *	Changes to be committed:	climbalima	2016-11-10	9	-0/+402
*	Updated my repo to current qmk	climbalima	2016-11-16	10	-0/+397