Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge pull request #914 from wez/ble_2 | Jack Humbert | 2016-12-02 |
|\ | |||
| * | Add arduino-alike GPIO pin control helpers | Wez Furlong | 2016-11-27 |
* | | Merge pull request #913 from wez/ble_1 | Jack Humbert | 2016-12-02 |
|\| | |||
| * | Tidy up atomicity in timer.c and ring_buffer.h | Wez Furlong | 2016-11-27 |
* | | Merge pull request #924 from cbbrowne/master | Jack Humbert | 2016-12-02 |
|\ \ | |||
| * | | I also want page-down/page-up on UPPER layer | cbbrowne | 2016-12-02 |
| * | | I want page-down/page-up - put those on LOWER-Left/Right near bottom corner | cbbrowne | 2016-12-02 |
| * | | Improve docs on memory usage | cbbrowne | 2016-12-01 |
| * | | Improve docs on SYSEX bit | cbbrowne | 2016-12-01 |
| * | | More notes on .hex size protection | cbbrowne | 2016-12-01 |
| * | | Make my builds smaller | cbbrowne | 2016-12-01 |
| * | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | cbbrowne | 2016-12-01 |
| |\ \ | |||
| * \ \ | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | cbbrowne | 2016-11-29 |
| |\ \ \ | |||
| * \ \ \ | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | cbbrowne | 2016-11-28 |
| |\ \ \ \ | | | |_|/ | | |/| | | |||
| * | | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | cbbrowne | 2016-11-25 |
| |\ \ \ \ | |||
| * \ \ \ \ | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | cbbrowne | 2016-11-23 |
| |\ \ \ \ \ | |||
| * \ \ \ \ \ | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | cbbrowne | 2016-11-16 |
| |\ \ \ \ \ \ | |||
| * \ \ \ \ \ \ | Merge branch 'master' of github.com:cbbrowne/qmk_firmware | cbbrowne | 2016-11-11 |
| |\ \ \ \ \ \ \ | |||
| | * \ \ \ \ \ \ | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | Chris Browne | 2016-11-10 |
| | |\ \ \ \ \ \ \ | |||
| * | \ \ \ \ \ \ \ | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | cbbrowne | 2016-11-11 |
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| / / / / / / / | | |/ / / / / / / | |||
| * | | | | | | | | Merge branch 'master' of github.com:cbbrowne/qmk_firmware | cbbrowne | 2016-11-07 |
| |\ \ \ \ \ \ \ \ | |||
| | * \ \ \ \ \ \ \ | Merge branch 'master' of github.com:cbbrowne/qmk_firmware | Chris Browne | 2016-11-06 |
| | |\ \ \ \ \ \ \ \ | |||
| | * \ \ \ \ \ \ \ \ | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | Chris Browne | 2016-11-06 |
| | |\ \ \ \ \ \ \ \ \ | |||
| * | \ \ \ \ \ \ \ \ \ | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | cbbrowne | 2016-11-07 |
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / | |/| | | | | | | | | | | |||
| * | | | | | | | | | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | cbbrowne | 2016-11-01 |
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / | | |/| | | | | | | | | | |||
| * | | | | | | | | | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | cbbrowne | 2016-10-31 |
| |\ \ \ \ \ \ \ \ \ \ \ | |||
| * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | cbbrowne | 2016-10-26 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | |||
| * | | | | | | | | | | | | Merge branch 'master' of github.com:cbbrowne/qmk_firmware | Chris Browne | 2016-10-23 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | |||
| | * \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | cbbrowne | 2016-10-20 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | |||
| | * \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | cbbrowne | 2016-10-18 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of github.com:cbbrowne/qmk_firmware | cbbrowne | 2016-10-17 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | cbbrowne | 2016-10-17 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | Chris Browne | 2016-10-23 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / / / / / | |/| | | | / / / / / / / / / / / / | | | |_|_|/ / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | |||
| * | | | | | | | | | | | | | | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | Chris Browne | 2016-10-16 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / / | |/| | / / / / / / / / / / / / / | | | |/ / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | |||
| * | | | | | | | | | | | | | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | cbbrowne | 2016-10-13 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | | | | I keep mis-using UPPER|LOWER/SLASH, and getting RESET. | cbbrowne | 2016-10-12 |
| * | | | | | | | | | | | | | | | | Merge branch 'master' of github.com:cbbrowne/qmk_firmware | cbbrowne | 2016-10-12 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | Chris Browne | 2016-10-10 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of github.com:cbbrowne/qmk_firmware | Chris Browne | 2016-10-10 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | Christopher Browne | 2016-02-06 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
* | | | | | | | | | | | | | | | | | | | | | Annotates nordic | Erez Zukerman | 2016-12-02 |
* | | | | | | | | | | | | | | | | | | | | | Tweaks Kristian's layout again | Erez Zukerman | 2016-12-02 |
* | | | | | | | | | | | | | | | | | | | | | Kristian's keymap | Erez Zukerman | 2016-12-02 |
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | |||
* | | | | | | | | | | | | | | | | | | | | Better layout | Erez Zukerman | 2016-11-30 |
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | |||
* | | | | | | | | | | | | | | | | | | | Merge pull request #919 from jackhumbert/hf/robot_test_layout | Jack Humbert | 2016-11-29 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | | | | | | | Test layout for ErgoDox EZ manufacturing robot | Erez Zukerman | 2016-11-29 |
|/ / / / / / / / / / / / / / / / / / / | |||
* | | | | | | | | | | | | | | | | | | | Merge pull request #918 from jackhumbert/wu5y7 | Erez Zukerman | 2016-11-29 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | | | | | | | guess i didnt pull | Jack Humbert | 2016-11-29 |
| * | | | | | | | | | | | | | | | | | | | Merge branch 'wu5y7' of github.com:jackhumbert/qmk_firmware into wu5y7 | Jack Humbert | 2016-11-29 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| | * | | | | | | | | | | | | | | | | | | | Tweaks position of TOG not to conflict with MO | Erez Zukerman | 2016-11-28 |