4 Commits (902d5077cd54f3a964e3276d7858212d975818ec)

Author	SHA1	Message	Date
climbalima	21b6b4e6c4	should have fixed conflixed	8 years ago
climbalima	5cac51a773	Merge https://github.com/climbalima/qmk_firmware	8 years ago
climbalima	1dd6ceb45d	Updated my repo to current qmk	8 years ago
climbalima	b5cecb4cc9	Added both revisions into one folder	8 years ago