5 Commits (af13e9a12d64f74873e5bf429fdedcda37b3036a)

Author	SHA1	Message	Date
Danny Nguyen	d0cfaba6d2	Revise KEYMAP macro to make left and right halves more clear	2017-04-03 13:24:11 -04:00
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