summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #21 from qmk/masterDamien2017-04-2992-234/+2831
|\
| * Merge pull request #1259 from laelath/masterJack Humbert2017-04-262-11/+121
| |\
| | * Expanded lae3 keymap readmelaelath2017-04-262-11/+121
| * | Merge pull request #1258 from smt/smt/hhkbJack Humbert2017-04-261-0/+176
| |\ \ | | |/ | |/|
| | * Add smt keymap for HHKBStephen Tudor2017-04-241-0/+176
| * | Merge pull request #1231 from Dbroqua/masterJack Humbert2017-04-2515-209/+458
| |\ \ | |/ / |/| |
* | | - Moved S60-X RGB in sub project for S60-Xdbroqua2017-04-1919-345/+170
* | | - Fixed bug in keymap for s60-X RGBdbroqua2017-04-181-1/+1
* | | - Added S-60-X RGB directory (based on qmk.sized.io work)dbroqua2017-04-158-0/+424
* | | Merge pull request #20 from qmk/masterDamien2017-04-13114-1679/+5047
|\ \ \
| | * \ Merge pull request #1253 from laelath/masterJack Humbert2017-04-254-0/+294
| | |\ \
| | | * | Switched Alt and GUI key placesJustin Frank2017-04-231-2/+2
| | | * | Added lae3 keymapJustin Frank2017-04-224-0/+294
| | * | | Merge pull request #1255 from ryanmaclean/patch-4Jack Humbert2017-04-252-0/+130
| | |\ \ \
| | | * | | Adding Right LayoutRyan MacLean2017-04-221-0/+65
| | | * | | Update keymap.cRyan MacLean2017-04-220-0/+0
| | | * | | Initial Ortho Commit (LEFT SIDE)Ryan MacLean2017-04-221-0/+65
| | | |/ /
| | * | | Merge pull request #1257 from MachineIndustries/keyboards/M10AJack Humbert2017-04-257-0/+229
| | |\ \ \ | | | |/ / | | |/| |
| | | * | Add RAMA x Machine Industries M10A to the keyboards directoryJosh Black2017-04-257-0/+229
| | |/ /
| | * | Added an additional clueboard layout. (#1252)Solomon2017-04-226-0/+130
| | * | Tweak the shift_fn keymap so it worksskullY2017-04-212-19/+22
| | * | Merge pull request #1246 from reversebias/masterJack Humbert2017-04-198-0/+687
| | |\ \
| | | * | Update readme.mdreversebias2017-04-191-158/+6
| | | * | First Commitcam2017-04-198-0/+839
| | | * | Delete tempreversebias2017-04-191-1/+0
| | | * | Create tempreversebias2017-04-191-0/+1
| | * | | Merge pull request #1245 from fredizzimo/fix_lcd_pin_configurationJack Humbert2017-04-191-1/+1
| | |\ \ \
| | | * | | Fix LCD SS pin configurationFred Sundvik2017-04-191-1/+1
| | | |/ /
| | * | | Merge pull request #1244 from ryanmaclean/patch-3Jack Humbert2017-04-192-1/+118
| | |\ \ \
| | | * | | Adding Sample Max LayoutRyan MacLean2017-04-181-0/+102
| | | * | | Adding Maximized KeymapRyan MacLean2017-04-181-1/+16
| | | |/ /
| | * | | Merge pull request #1243 from Xyverz/masterJack Humbert2017-04-191-25/+20
| | |\ \ \ | | | |/ / | | |/| |
| | | * | LT doesn't work with tri_layer. Removed it from this keymap.Xyverz2017-04-181-25/+20
| | | * | swapped RAISE with LOWER in layer-tapping macros.Xyverz2017-04-181-6/+6
| | * | | Merge pull request #1239 from priyadi/promethiumJack Humbert2017-04-188-54/+501
| | |\ \ \
| | | * | | Fix Planck compatibilityPriyadi Iman Nurcahyo2017-04-191-0/+2
| | | * | | Keymap updates and some adjustment for latest version of QMKPriyadi Iman Nurcahyo2017-04-194-24/+125
| | | * | | Promethium rev2Priyadi Iman Nurcahyo2017-04-197-30/+374
| | | | |/ | | | |/|
| | * | | Merge pull request #1238 from priyadi/fauxclicky_fixJack Humbert2017-04-182-16/+9
| | |\ \ \
| | | * | | Faux clicky bug fixesPriyadi Iman Nurcahyo2017-04-192-16/+9
| | | |/ /
| | * | | Merge pull request #1236 from Xyverz/masterJack Humbert2017-04-181-55/+89
| | |\ \ \ | | | | |/ | | | |/|
| | | * | Fixed a weird diff mishap.Xyverz2017-04-171-10/+0
| | | * | Merge branch 'tv44_revamp'Xyverz2017-04-171-48/+89
| | | |\ \
| | | | * | Updated my TV44 keymap to be more planck-like.Xyverz2017-04-171-50/+51
| | | | * | Added keymap to TV44 RevampXyverz2017-04-161-40/+73
| | | * | | macros to make keymap reading easier.Xyverz2017-04-161-3/+6
| | | |/ /
| | * | | Merge pull request #1235 from siroken3/siroken3Jack Humbert2017-04-185-0/+202
| | |\ \ \ | | | |_|/ | | |/| |
| | | * | fix backspace key position.Kenichi Sasaki2017-03-051-2/+2
| | | * | fix againKenichi Sasaki2017-03-041-98/+55
| | | * | change bracket key posisionKenichi Sasaki2017-02-191-14/+14