6 Commits (ef2ebeb3cace7f2555ccf655f3a7bb7c9bb77b76)

Author	SHA1	Message	Date
climbalima	0f71c81df8	having trouble with conflicts	2016-12-03 17:37:41 -05:00
climbalima	59c54d651b	Merge https://github.com/climbalima/qmk_firmware	2016-12-03 17:15:22 -05:00
climbalima	102a830bbd	changed readme	2016-11-19 00:49:20 -05:00
climbalima	e356de2220	added the pinout for pro micro into maxipad	2016-11-19 00:44:52 -05:00
climbalima	01736a502e	just saving	2016-11-18 23:40:34 -05:00
climbalima	1dd6ceb45d	Updated my repo to current qmk	2016-11-16 19:18:54 -05:00