summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2017-04-01Add keymap diagrams to readme of keymap “coderkun_neo2”coderkun1-9/+114
2017-04-01Merge branch 'master' into coderkun_neo2coderkun586-5506/+32053
2017-04-01Merge pull request #1132 from akatrevorjay/pr/dfu-serialJack Humbert1-1/+6
Allow to specify serial to dfu-util flash
2017-04-01Merge pull request #1190 from osamuaoki/masterJack Humbert1-7/+7
Fix typo
2017-04-01Merge pull request #1189 from Zay950/to_pushJack Humbert13-0/+1278
Unicode input_mode presistance
2017-03-31Fix typoOsamu Aoki1-7/+7
2017-03-31Worked around some new Makefile issues.nielsenz9-56/+58
2017-03-31Pulling and pushing troublesnielsenz2-75/+15
2017-03-31changed hotkey cluster to accomodate awkward software... againCallum Oakley1-1/+1
2017-03-31changed hotkey cluster to accomodate awkward softwareCallum Oakley1-7/+7
2017-03-31Add RN42 Bluetooth module supportTravis La Marr4-2/+43
Added support for sending HID keycodes over the RN42/reflashed HC05 module. Tested on OS X and iOS.
2017-03-31Update to match QMK keymapOsamu Aoki1-89/+143
2017-03-31Typo fixOsamu Aoki1-1/+1
2017-03-30Merge pull request #1188 from hot-leaf-juice/masterJack Humbert1-1/+1
changed hotkey cluster to accomodate awkward software... again
2017-03-30changed hotkey cluster to accomodate awkward software... againCallum Oakley1-1/+1
2017-03-30Merge pull request #1187 from hot-leaf-juice/masterJack Humbert1-7/+7
changed hotkey cluster to acommodate awkward software
2017-03-30Merge pull request #1185 from exiva/rn42_bluetoothJack Humbert4-2/+43
Add RN42 Bluetooth module support
2017-03-30Merge pull request #1184 from osamuaoki/masterJack Humbert2-90/+144
Update keymap.md to QMK
2017-03-30changed hotkey cluster to accomodate awkward softwareCallum Oakley1-7/+7
2017-03-30Add RN42 Bluetooth module supportTravis La Marr4-2/+43
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_pushZay950743-7061/+63741
2017-03-29Update to match QMK keymapOsamu Aoki1-89/+143
2017-03-29Typo fixOsamu Aoki1-1/+1
2017-03-29Merge pull request #1183 from Rovanion/real-masterJack Humbert1-4/+17
Added instructions for how to build and flash the firmware with teensy_cli
2017-03-29Added link to the teensy linux page.Rovanion Luckey1-2/+5
2017-03-29Clarify the quantum license (#1042)skullydazed89-1293/+2172
* 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 Humbert1-6/+6
Default atreus layout
2017-03-28Merge pull request #1139 from Swoy/masterJack Humbert4-0/+328
Satan Board "Admiral Strokers" keymap and config
2017-03-28typo removed {3 ...Ole Anders1-3/+2
2017-03-28fixed capitalization issue (checkTime => checktime)Ole Anders1-2/+4
2017-03-28Merge branch 'master' into default_atreus_layoutHugh Enxing101-782/+4925
2017-03-28moved checktime out of functionOle Anders1-6/+3
2017-03-28declaring checktime before the function it is used in.Ole Anders1-0/+1
2017-03-28fixed function to not accept any arguments.Ole Anders1-1/+1
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 Anders1-1/+0
2017-03-28slight cleanup as per recommendationOle Anders1-1/+2
2017-03-28Moved key_timer out of function.Ole Anders1-3/+4
2017-03-28removed a carriage returnOle Anders1-19/+18
2017-03-28Merge remote-tracking branch 'refs/remotes/qmk/master'Ole Anders324-3360/+16019
2017-03-28fixed #1139 issuesOle Anders1-18/+18
A fix described by jackhumbert has been sorted out now.
2017-03-28Merge pull request #1174 from nooges/atreus50Jack Humbert8-0/+565
Add Atreus50 keyboard
2017-03-28Merge pull request #1112 from newsboytko/newsboytko/midi-keycodesJack Humbert36-506/+1445
Flesh out MIDI support
2017-03-28Merge pull request #1098 from lambdalisue/tapping-force-holdJack Humbert2-4/+8
Add TAPPING_FORCE_HOLD to regulate behaviour
2017-03-28Merge pull request #1167 from smt/smt/satanJack Humbert3-0/+163
Add smt keymap for Satan 'GH60'
2017-03-28Merge pull request #1162 from Khord/masterJack Humbert4-0/+460
My customized keymap + some tunes for the song list
2017-03-28Move Atreus50 to hardwired directory and update READMEDanny Nguyen9-25/+16
2017-03-28Merge pull request #1172 from nooges/hexwire-fixesJack Humbert5-26/+45
Let's Split hexwire keymap fixes
2017-03-28Merge pull request #1157 from jtbarrett/tada68_defaultJack Humbert4-58/+26
Update readme and default layout for TADA68
2017-03-28Merge pull request #1180 from mattdibi/masterJack Humbert2-0/+295
Italian layout for ergodox keyboard
2017-03-28Merge pull request #1171 from ishtob/masterJack Humbert18-184/+1281
SSD1306 I2C OLED display support for let's split