4 Commits (5944ab246a981d6ceca94b0972345277a746c2d3)

Author	SHA1	Message	Date
climbalima	21b6b4e6c4	should have fixed conflixed	2016-11-16 19:49:38 -05:00
climbalima	5cac51a773	Merge https://github.com/climbalima/qmk_firmware	2016-11-16 19:26:38 -05:00
climbalima	1dd6ceb45d	Updated my repo to current qmk	2016-11-16 19:18:54 -05:00
climbalima	b5cecb4cc9	Added both revisions into one folder	2016-11-10 20:03:24 -05:00