summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2017-03-31Merge pull request #1132 from akatrevorjay/pr/dfu-serialJack Humbert
2017-03-31Merge pull request #1190 from osamuaoki/masterJack Humbert
2017-03-31Merge pull request #1189 from Zay950/to_pushJack Humbert
2017-04-01Fix typoOsamu Aoki
2017-03-30Worked around some new Makefile issues.nielsenz
2017-03-30Pulling and pushing troublesnielsenz
2017-03-30changed hotkey cluster to accomodate awkward software... againCallum Oakley
2017-03-30changed hotkey cluster to accomodate awkward softwareCallum Oakley
2017-03-30Add RN42 Bluetooth module supportTravis La Marr
2017-03-30Update to match QMK keymapOsamu Aoki
2017-03-30Typo fixOsamu Aoki
2017-03-30Merge pull request #1188 from hot-leaf-juice/masterJack Humbert
2017-03-30changed hotkey cluster to accomodate awkward software... againCallum Oakley
2017-03-30Merge pull request #1187 from hot-leaf-juice/masterJack Humbert
2017-03-30Merge pull request #1185 from exiva/rn42_bluetoothJack Humbert
2017-03-30Merge pull request #1184 from osamuaoki/masterJack Humbert
2017-03-30changed hotkey cluster to accomodate awkward softwareCallum Oakley
2017-03-29Tidied up keymaps, Makefiles that actually work, Clueboard make v1.0Xyverz
2017-03-29Add RN42 Bluetooth module supportTravis La Marr
2017-03-29Merge branch 'master' into to_pushZay950
2017-03-30Update to match QMK keymapOsamu Aoki
2017-03-30Typo fixOsamu Aoki
2017-03-29Merge pull request #1183 from Rovanion/real-masterJack Humbert
2017-03-29Added link to the teensy linux page.Rovanion Luckey
2017-03-28Clarify the quantum license (#1042)skullydazed
2017-03-28Merge pull request #1182 from henxing/default_atreus_layoutJack Humbert
2017-03-28Merge pull request #1139 from Swoy/masterJack Humbert
2017-03-28typo removed {3 ...Ole Anders
2017-03-28fixed capitalization issue (checkTime => checktime)Ole Anders
2017-03-28Merge branch 'master' into default_atreus_layoutHugh Enxing
2017-03-28moved checktime out of functionOle Anders
2017-03-28declaring checktime before the function it is used in.Ole Anders
2017-03-28fixed function to not accept any arguments.Ole Anders
2017-03-28removed varable trace option from makefileOle Anders
2017-03-28slight cleanup as per recommendationOle Anders
2017-03-28Moved key_timer out of function.Ole Anders
2017-03-28removed a carriage returnOle Anders
2017-03-28Merge remote-tracking branch 'refs/remotes/qmk/master'Ole Anders
2017-03-28fixed #1139 issuesOle Anders
2017-03-28Merge pull request #1174 from nooges/atreus50Jack Humbert
2017-03-28Merge pull request #1112 from newsboytko/newsboytko/midi-keycodesJack Humbert
2017-03-28Merge pull request #1098 from lambdalisue/tapping-force-holdJack Humbert
2017-03-28Merge pull request #1167 from smt/smt/satanJack Humbert
2017-03-28Merge pull request #1162 from Khord/masterJack Humbert
2017-03-28Move Atreus50 to hardwired directory and update READMEDanny Nguyen
2017-03-28Merge pull request #1172 from nooges/hexwire-fixesJack Humbert
2017-03-28Merge pull request #1157 from jtbarrett/tada68_defaultJack Humbert
2017-03-28Merge pull request #1180 from mattdibi/masterJack Humbert
2017-03-28Merge pull request #1171 from ishtob/masterJack Humbert
2017-03-28Merge pull request #1168 from newsboytko/newsboytko/frosty-flakeJack Humbert