summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1190 from osamuaoki/masterJack Humbert2017-03-311-7/+7
|\ | | | | Fix typo
| * Fix typoOsamu Aoki2017-04-011-7/+7
| |
* | Merge pull request #1189 from Zay950/to_pushJack Humbert2017-03-3113-0/+1278
|\ \ | |/ |/| Unicode input_mode presistance
| * Worked around some new Makefile issues.nielsenz2017-03-309-56/+58
| |
| * Pulling and pushing troublesnielsenz2017-03-302-75/+15
| |
| * changed hotkey cluster to accomodate awkward software... againCallum Oakley2017-03-301-1/+1
| |
| * changed hotkey cluster to accomodate awkward softwareCallum Oakley2017-03-301-7/+7
| |
| * Add RN42 Bluetooth module supportTravis La Marr2017-03-304-2/+43
| | | | | | | | Added support for sending HID keycodes over the RN42/reflashed HC05 module. Tested on OS X and iOS.
| * Update to match QMK keymapOsamu Aoki2017-03-301-89/+143
| |
| * Typo fixOsamu Aoki2017-03-301-1/+1
| |
| * Merge branch 'master' into to_pushZay9502017-03-29743-7061/+63741
| |\
| * | Missed removing a functionZach Nielsen2016-11-102-46/+0
| | |
| * | Removed some common functions from my keymapnielsenz2016-11-104-24/+6
| | |
| * | Missed some stuff. Added a song (stole it from reddit).Zach Nielsen2016-11-106-122/+19
| | |
| * | Adding my (zach) keymaps for planck and preonicZach Nielsen2016-11-108-0/+1422
| | |
| * | Keep unicode's input_mode through a power cycleZach Nielsen2016-11-102-0/+7
| | |
* | | Merge pull request #1188 from hot-leaf-juice/masterJack Humbert2017-03-301-1/+1
|\ \ \ | | | | | | | | changed hotkey cluster to accomodate awkward software... again
| * | | changed hotkey cluster to accomodate awkward software... againCallum Oakley2017-03-301-1/+1
| | | |
* | | | Merge pull request #1187 from hot-leaf-juice/masterJack Humbert2017-03-301-7/+7
|\| | | | | | | | | | | changed hotkey cluster to acommodate awkward software
| * | | changed hotkey cluster to accomodate awkward softwareCallum Oakley2017-03-301-7/+7
| | |/ | |/|
* | | Merge pull request #1185 from exiva/rn42_bluetoothJack Humbert2017-03-304-2/+43
|\ \ \ | | | | | | | | Add RN42 Bluetooth module support
| * | | Add RN42 Bluetooth module supportTravis La Marr2017-03-294-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/masterJack Humbert2017-03-302-90/+144
|\ \ \ | |/ / |/| | Update keymap.md to QMK
| * | Update to match QMK keymapOsamu Aoki2017-03-301-89/+143
| | |
| * | Typo fixOsamu Aoki2017-03-301-1/+1
| | |
* | | Merge pull request #1183 from Rovanion/real-masterJack Humbert2017-03-291-4/+17
|\ \ \ | | | | | | | | Added instructions for how to build and flash the firmware with teensy_cli
| * | | Added link to the teensy linux page.Rovanion Luckey2017-03-291-2/+5
| | | |
| * | | Added instructions for how to build and flash the firmware with teensy_cli.Rovanion Luckey2017-01-241-4/+14
| | | |
* | | | Clarify the quantum license (#1042)skullydazed2017-03-2889-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_layoutJack Humbert2017-03-281-6/+6
|\ \ \ \ | | | | | | | | | | Default atreus layout
| * \ \ \ Merge branch 'master' into default_atreus_layoutHugh Enxing2017-03-28101-782/+4925
| |\ \ \ \
| * | | | | Swapped placement of `Ctrl` and `Alt` keys to match Technomancy'sHugh Enxing2017-03-241-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | default layout
* | | | | | Merge pull request #1139 from Swoy/masterJack Humbert2017-03-284-0/+328
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Satan Board "Admiral Strokers" keymap and config
| * | | | | typo removed {3 ...Ole Anders2017-03-281-3/+2
| | | | | |
| * | | | | fixed capitalization issue (checkTime => checktime)Ole Anders2017-03-281-2/+4
| | | | | |
| * | | | | moved checktime out of functionOle Anders2017-03-281-6/+3
| | | | | |
| * | | | | declaring checktime before the function it is used in.Ole Anders2017-03-281-0/+1
| | | | | |
| * | | | | fixed function to not accept any arguments.Ole Anders2017-03-281-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 makefileOle Anders2017-03-281-1/+0
| | | | | |
| * | | | | slight cleanup as per recommendationOle Anders2017-03-281-1/+2
| | | | | |
| * | | | | Moved key_timer out of function.Ole Anders2017-03-281-3/+4
| | | | | |
| * | | | | removed a carriage returnOle Anders2017-03-281-19/+18
| | | | | |
| * | | | | Merge remote-tracking branch 'refs/remotes/qmk/master'Ole Anders2017-03-28324-3360/+16019
| |\ \ \ \ \ | |/ / / / / |/| | | | |
* | | | | | Merge pull request #1174 from nooges/atreus50Jack Humbert2017-03-288-0/+565
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add Atreus50 keyboard
| * | | | | | Move Atreus50 to hardwired directory and update READMEDanny Nguyen2017-03-289-25/+16
| | | | | | |
| * | | | | | Add RGB supportDanny Nguyen2017-03-233-4/+4
| | | | | | |
| * | | | | | Cleanup keymapDanny Nguyen2017-03-233-115/+94
| | | | | | |
| * | | | | | Initial commit for Atreus50 with working audioDanny Nguyen2017-03-239-0/+595
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #1112 from newsboytko/newsboytko/midi-keycodesJack Humbert2017-03-2836-506/+1445
|\ \ \ \ \ \ | | | | | | | | | | | | | | Flesh out MIDI support
| * | | | | | add debug messages to audioGabriel Young2017-03-021-158/+164
| | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-23 06:58:16 +0000