summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2017-04-02Update readme.mdAlexander Schaefer
There's no readme specifically for the Ergodox EZ now, so link to the Ergodox readme.
2017-03-31Merge pull request #1132 from akatrevorjay/pr/dfu-serialJack Humbert
Allow to specify serial to dfu-util flash
2017-03-31Merge pull request #1190 from osamuaoki/masterJack Humbert
Fix typo
2017-03-31Merge pull request #1189 from Zay950/to_pushJack Humbert
Unicode input_mode presistance
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
Added support for sending HID keycodes over the RN42/reflashed HC05 module. Tested on OS X and iOS.
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
changed hotkey cluster to accomodate awkward software... again
2017-03-30changed hotkey cluster to accomodate awkward software... againCallum Oakley
2017-03-30Merge pull request #1187 from hot-leaf-juice/masterJack Humbert
changed hotkey cluster to acommodate awkward software
2017-03-30Merge pull request #1185 from exiva/rn42_bluetoothJack Humbert
Add RN42 Bluetooth module support
2017-03-30Merge pull request #1184 from osamuaoki/masterJack Humbert
Update keymap.md to QMK
2017-03-30changed hotkey cluster to accomodate awkward softwareCallum Oakley
2017-03-29Add RN42 Bluetooth module supportTravis La Marr
Added support for sending HID keycodes over the RN42/reflashed HC05 module. Tested on OS X and iOS.
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
Added instructions for how to build and flash the firmware with teensy_cli
2017-03-29Added link to the teensy linux page.Rovanion Luckey
2017-03-28Clarify the quantum license (#1042)skullydazed
* Clarify the license for files we have signoff on * Update against the currently signed off files * Remove unused and not clearly licensed headers * Replace an #endif I accidentally removed while resolving merge conflicts
2017-03-28Merge pull request #1182 from henxing/default_atreus_layoutJack Humbert
Default atreus layout
2017-03-28Merge pull request #1139 from Swoy/masterJack Humbert
Satan Board "Admiral Strokers" keymap and config
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
As per Pramod's comment on stack overflow: In C int foo() and int foo(void) are different functions. int foo() accepts an arbitrary number of arguments, while int foo(void) accepts 0 arguments. In C++ they mean the same thing. I suggest that you use void consistently when you mean no arguments.
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
A fix described by jackhumbert has been sorted out now.
2017-03-28Merge pull request #1174 from nooges/atreus50Jack Humbert
Add Atreus50 keyboard
2017-03-28Merge pull request #1112 from newsboytko/newsboytko/midi-keycodesJack Humbert
Flesh out MIDI support
2017-03-28Merge pull request #1098 from lambdalisue/tapping-force-holdJack Humbert
Add TAPPING_FORCE_HOLD to regulate behaviour
2017-03-28Merge pull request #1167 from smt/smt/satanJack Humbert
Add smt keymap for Satan 'GH60'
2017-03-28Merge pull request #1162 from Khord/masterJack Humbert
My customized keymap + some tunes for the song list
2017-03-28Move Atreus50 to hardwired directory and update READMEDanny Nguyen
2017-03-28Merge pull request #1172 from nooges/hexwire-fixesJack Humbert
Let's Split hexwire keymap fixes
2017-03-28Merge pull request #1157 from jtbarrett/tada68_defaultJack Humbert
Update readme and default layout for TADA68
2017-03-28Merge pull request #1180 from mattdibi/masterJack Humbert
Italian layout for ergodox keyboard
2017-03-28Merge pull request #1171 from ishtob/masterJack Humbert
SSD1306 I2C OLED display support for let's split
2017-03-28Merge pull request #1168 from newsboytko/newsboytko/frosty-flakeJack Humbert
Support Frosty Flake Controller (CM Storm QFR)