Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #913 from wez/ble_1 | Jack Humbert | 2016-12-02 | 2 | -34/+28 |
|\ | |||||
| * | Tidy up atomicity in timer.c and ring_buffer.h | Wez Furlong | 2016-11-27 | 2 | -34/+28 |
* | | Merge pull request #924 from cbbrowne/master | Jack Humbert | 2016-12-02 | 4 | -10/+36 |
|\ \ | |||||
| * | | I also want page-down/page-up on UPPER layer | cbbrowne | 2016-12-02 | 1 | -1/+1 |
| * | | I want page-down/page-up - put those on LOWER-Left/Right near bottom corner | cbbrowne | 2016-12-02 | 1 | -1/+2 |
| * | | Improve docs on memory usage | cbbrowne | 2016-12-01 | 1 | -0/+7 |
| * | | Improve docs on SYSEX bit | cbbrowne | 2016-12-01 | 1 | -1/+1 |
| * | | More notes on .hex size protection | cbbrowne | 2016-12-01 | 1 | -3/+16 |
| * | | Make my builds smaller | cbbrowne | 2016-12-01 | 2 | -3/+7 |
| * | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | cbbrowne | 2016-12-01 | 1 | -50/+71 |
| |\ \ | |||||
| * \ \ | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | cbbrowne | 2016-11-29 | 71 | -346/+2112 |
| |\ \ \ | |||||
| * \ \ \ | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | cbbrowne | 2016-11-28 | 18 | -82/+1340 |
| |\ \ \ \ | | | |_|/ | | |/| | | |||||
| * | | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | cbbrowne | 2016-11-25 | 4 | -8/+47 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | cbbrowne | 2016-11-23 | 54 | -228/+2439 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | cbbrowne | 2016-11-16 | 22 | -249/+1209 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merge branch 'master' of github.com:cbbrowne/qmk_firmware | cbbrowne | 2016-11-11 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | Chris Browne | 2016-11-10 | 2 | -1/+59 |
| | |\ \ \ \ \ \ \ | |||||
| * | \ \ \ \ \ \ \ | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | cbbrowne | 2016-11-11 | 2 | -1/+59 |
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| / / / / / / / | | |/ / / / / / / | |||||
| * | | | | | | | | Merge branch 'master' of github.com:cbbrowne/qmk_firmware | cbbrowne | 2016-11-07 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ | Merge branch 'master' of github.com:cbbrowne/qmk_firmware | Chris Browne | 2016-11-06 | 0 | -0/+0 |
| | |\ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | Chris Browne | 2016-11-06 | 35 | -599/+1870 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| * | \ \ \ \ \ \ \ \ \ | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | cbbrowne | 2016-11-07 | 5 | -3/+178 |
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / | |/| | | | | | | | | | | |||||
| * | | | | | | | | | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | cbbrowne | 2016-11-01 | 14 | -481/+1135 |
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / | | |/| | | | | | | | | | |||||
| * | | | | | | | | | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | cbbrowne | 2016-10-31 | 4 | -67/+122 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | cbbrowne | 2016-10-26 | 18 | -51/+613 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Merge branch 'master' of github.com:cbbrowne/qmk_firmware | Chris Browne | 2016-10-23 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | cbbrowne | 2016-10-20 | 10 | -0/+676 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | cbbrowne | 2016-10-18 | 23 | -127/+873 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of github.com:cbbrowne/qmk_firmware | cbbrowne | 2016-10-17 | 0 | -0/+0 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | cbbrowne | 2016-10-17 | 11 | -72/+497 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | Chris Browne | 2016-10-23 | 33 | -127/+1549 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / / / / | |/| | | | / / / / / / / / / / / / | | | |_|_|/ / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | Chris Browne | 2016-10-16 | 11 | -72/+497 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / / | |/| | / / / / / / / / / / / / / | | | |/ / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | cbbrowne | 2016-10-13 | 7 | -7/+523 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | I keep mis-using UPPER|LOWER/SLASH, and getting RESET. | cbbrowne | 2016-10-12 | 1 | -2/+3 |
| * | | | | | | | | | | | | | | | | Merge branch 'master' of github.com:cbbrowne/qmk_firmware | cbbrowne | 2016-10-12 | 0 | -0/+0 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | Chris Browne | 2016-10-10 | 13 | -26/+433 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of github.com:cbbrowne/qmk_firmware | Chris Browne | 2016-10-10 | 6864 | -2402769/+107777 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | Christopher Browne | 2016-02-06 | 9 | -1515/+1177 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
* | | | | | | | | | | | | | | | | | | | | | Annotates nordic | Erez Zukerman | 2016-12-02 | 1 | -1/+1 |
* | | | | | | | | | | | | | | | | | | | | | Tweaks Kristian's layout again | Erez Zukerman | 2016-12-02 | 1 | -1/+1 |
* | | | | | | | | | | | | | | | | | | | | | Kristian's keymap | Erez Zukerman | 2016-12-02 | 1 | -0/+79 |
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | | | Better layout | Erez Zukerman | 2016-11-30 | 1 | -50/+71 |
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | |||||
* | | | | | | | | | | | | | | | | | | | Merge pull request #919 from jackhumbert/hf/robot_test_layout | Jack Humbert | 2016-11-29 | 4 | -0/+143 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | Test layout for ErgoDox EZ manufacturing robot | Erez Zukerman | 2016-11-29 | 4 | -0/+143 |
|/ / / / / / / / / / / / / / / / / / / | |||||
* | | | | | | | | | | | | | | | | | | | Merge pull request #918 from jackhumbert/wu5y7 | Erez Zukerman | 2016-11-29 | 65 | -204/+1761 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | | | | | | | guess i didnt pull | Jack Humbert | 2016-11-29 | 1 | -11/+0 |
| * | | | | | | | | | | | | | | | | | | | Merge branch 'wu5y7' of github.com:jackhumbert/qmk_firmware into wu5y7 | Jack Humbert | 2016-11-29 | 4 | -14/+20 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | | | | | | Tweaks position of TOG not to conflict with MO | Erez Zukerman | 2016-11-28 | 1 | -3/+3 |
| | * | | | | | | | | | | | | | | | | | | | Tweaks EZ Makefile | Erez Zukerman | 2016-11-28 | 1 | -1/+6 |
| | * | | | | | | | | | | | | | | | | | | | Pulls LED config into common config for EZ | Erez Zukerman | 2016-11-28 | 2 | -10/+11 |