| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge pull request #19 from qmk/master | Damien | 2017-04-02 | 269 | -2376/+14063 |
| |\ | | | | | Merge from qmk | ||||
| | * | Merge pull request #1132 from akatrevorjay/pr/dfu-serial | Jack Humbert | 2017-03-31 | 1 | -1/+6 |
| | |\ | | | | | | | Allow to specify serial to dfu-util flash | ||||
| | | * | Allow to specify serial to dfu-util flash | Trevor Joynson (trevorj) | 2017-03-02 | 1 | -1/+6 |
| | | | | |||||
| | * | | Merge pull request #1190 from osamuaoki/master | Jack Humbert | 2017-03-31 | 1 | -7/+7 |
| | |\ \ | | | | | | | | | Fix typo | ||||
| | | * | | Fix typo | Osamu Aoki | 2017-04-01 | 1 | -7/+7 |
| | | | | | |||||
| | * | | | Merge pull request #1189 from Zay950/to_push | Jack Humbert | 2017-03-31 | 13 | -0/+1278 |
| | |\ \ \ | | |/ / | |/| | | Unicode input_mode presistance | ||||
| | | * | | Worked around some new Makefile issues. | nielsenz | 2017-03-30 | 9 | -56/+58 |
| | | | | | |||||
| | | * | | Pulling and pushing troubles | nielsenz | 2017-03-30 | 2 | -75/+15 |
| | | | | | |||||
| | | * | | changed hotkey cluster to accomodate awkward software... again | Callum Oakley | 2017-03-30 | 1 | -1/+1 |
| | | | | | |||||
| | | * | | changed hotkey cluster to accomodate awkward software | Callum Oakley | 2017-03-30 | 1 | -7/+7 |
| | | | | | |||||
| | | * | | Add RN42 Bluetooth module support | Travis La Marr | 2017-03-30 | 4 | -2/+43 |
| | | | | | | | | | | | | | | | | | Added support for sending HID keycodes over the RN42/reflashed HC05 module. Tested on OS X and iOS. | ||||
| | | * | | Update to match QMK keymap | Osamu Aoki | 2017-03-30 | 1 | -89/+143 |
| | | | | | |||||
| | | * | | Typo fix | Osamu Aoki | 2017-03-30 | 1 | -1/+1 |
| | | | | | |||||
| | | * | | Merge branch 'master' into to_push | Zay950 | 2017-03-29 | 743 | -7061/+63741 |
| | | |\ \ | |||||
| | | * | | | Missed removing a function | Zach Nielsen | 2016-11-10 | 2 | -46/+0 |
| | | | | | | |||||
| | | * | | | Removed some common functions from my keymap | nielsenz | 2016-11-10 | 4 | -24/+6 |
| | | | | | | |||||
| | | * | | | Missed some stuff. Added a song (stole it from reddit). | Zach Nielsen | 2016-11-10 | 6 | -122/+19 |
| | | | | | | |||||
| | | * | | | Adding my (zach) keymaps for planck and preonic | Zach Nielsen | 2016-11-10 | 8 | -0/+1422 |
| | | | | | | |||||
| | | * | | | Keep unicode's input_mode through a power cycle | Zach Nielsen | 2016-11-10 | 2 | -0/+7 |
| | | | | | | |||||
| | * | | | | Merge pull request #1188 from hot-leaf-juice/master | Jack Humbert | 2017-03-30 | 1 | -1/+1 |
| | |\ \ \ \ | | | | | | | | | | | | | changed hotkey cluster to accomodate awkward software... again | ||||
| | | * | | | | changed hotkey cluster to accomodate awkward software... again | Callum Oakley | 2017-03-30 | 1 | -1/+1 |
| | | | | | | | |||||
| | * | | | | | Merge pull request #1187 from hot-leaf-juice/master | Jack Humbert | 2017-03-30 | 1 | -7/+7 |
| | |\| | | | | | | | | | | | | | | | | changed hotkey cluster to acommodate awkward software | ||||
| | | * | | | | changed hotkey cluster to accomodate awkward software | Callum Oakley | 2017-03-30 | 1 | -7/+7 |
| | | | |/ / | | |/| | | |||||
| | * | | | | Merge pull request #1185 from exiva/rn42_bluetooth | Jack Humbert | 2017-03-30 | 4 | -2/+43 |
| | |\ \ \ \ | | | | | | | | | | | | | Add RN42 Bluetooth module support | ||||
| | | * | | | | Add RN42 Bluetooth module support | Travis La Marr | 2017-03-29 | 4 | -2/+43 |
| | | |/ / / | | | | | | | | | | | | | | | | Added support for sending HID keycodes over the RN42/reflashed HC05 module. Tested on OS X and iOS. | ||||
| | * | | | | Merge pull request #1184 from osamuaoki/master | Jack Humbert | 2017-03-30 | 2 | -90/+144 |
| | |\ \ \ \ | | |/ / / | |/| | | | Update keymap.md to QMK | ||||
| | | * | | | Update to match QMK keymap | Osamu Aoki | 2017-03-30 | 1 | -89/+143 |
| | | | | | | |||||
| | | * | | | Typo fix | Osamu Aoki | 2017-03-30 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | Merge pull request #1183 from Rovanion/real-master | Jack Humbert | 2017-03-29 | 1 | -4/+17 |
| | |\ \ \ \ | | | | | | | | | | | | | Added instructions for how to build and flash the firmware with teensy_cli | ||||
| | | * | | | | Added link to the teensy linux page. | Rovanion Luckey | 2017-03-29 | 1 | -2/+5 |
| | | | | | | | |||||
| | | * | | | | Added instructions for how to build and flash the firmware with teensy_cli. | Rovanion Luckey | 2017-01-24 | 1 | -4/+14 |
| | | | | | | | |||||
| | * | | | | | Clarify the quantum license (#1042) | skullydazed | 2017-03-28 | 89 | -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 | ||||
| | * | | | | | Merge pull request #1182 from henxing/default_atreus_layout | Jack Humbert | 2017-03-28 | 1 | -6/+6 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | Default atreus layout | ||||
| | | * \ \ \ \ | Merge branch 'master' into default_atreus_layout | Hugh Enxing | 2017-03-28 | 101 | -782/+4925 |
| | | |\ \ \ \ \ | |||||
| | | * | | | | | | Swapped placement of `Ctrl` and `Alt` keys to match Technomancy's | Hugh Enxing | 2017-03-24 | 1 | -6/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | default layout | ||||
| | * | | | | | | | Merge pull request #1139 from Swoy/master | Jack Humbert | 2017-03-28 | 4 | -0/+328 |
| | |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | Satan Board "Admiral Strokers" keymap and config | ||||
| | | * | | | | | | typo removed {3 ... | Ole Anders | 2017-03-28 | 1 | -3/+2 |
| | | | | | | | | | |||||
| | | * | | | | | | fixed capitalization issue (checkTime => checktime) | Ole Anders | 2017-03-28 | 1 | -2/+4 |
| | | | | | | | | | |||||
| | | * | | | | | | moved checktime out of function | Ole Anders | 2017-03-28 | 1 | -6/+3 |
| | | | | | | | | | |||||
| | | * | | | | | | declaring checktime before the function it is used in. | Ole Anders | 2017-03-28 | 1 | -0/+1 |
| | | | | | | | | | |||||
| | | * | | | | | | fixed function to not accept any arguments. | Ole Anders | 2017-03-28 | 1 | -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. | ||||
| | | * | | | | | | removed varable trace option from makefile | Ole Anders | 2017-03-28 | 1 | -1/+0 |
| | | | | | | | | | |||||
| | | * | | | | | | slight cleanup as per recommendation | Ole Anders | 2017-03-28 | 1 | -1/+2 |
| | | | | | | | | | |||||
| | | * | | | | | | Moved key_timer out of function. | Ole Anders | 2017-03-28 | 1 | -3/+4 |
| | | | | | | | | | |||||
| | | * | | | | | | removed a carriage return | Ole Anders | 2017-03-28 | 1 | -19/+18 |
| | | | | | | | | | |||||
| | | * | | | | | | Merge remote-tracking branch 'refs/remotes/qmk/master' | Ole Anders | 2017-03-28 | 324 | -3360/+16019 |
| | | |\ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | |||||
| | * | | | | | | | Merge pull request #1174 from nooges/atreus50 | Jack Humbert | 2017-03-28 | 8 | -0/+565 |
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Add Atreus50 keyboard | ||||
| | | * | | | | | | | Move Atreus50 to hardwired directory and update README | Danny Nguyen | 2017-03-28 | 9 | -25/+16 |
| | | | | | | | | | | |||||
| | | * | | | | | | | Add RGB support | Danny Nguyen | 2017-03-23 | 3 | -4/+4 |
| | | | | | | | | | | |||||
| | | * | | | | | | | Cleanup keymap | Danny Nguyen | 2017-03-23 | 3 | -115/+94 |
| | | | | | | | | | | |||||
 |
index : qmk_firmware | |
| [no description] |
| summaryrefslogtreecommitdiffstats |