Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | | | | Merge pull request #932 from climbalima/master | Jack Humbert | 2016-12-04 | 11 | -193/+5851 | |
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / | |/| | | | | | | | | | ||||||
| * | | | | | | | | | | having trouble with conflicts | climbalima | 2016-12-03 | 3 | -20/+0 | |
| * | | | | | | | | | | cleaned up personal projects | climbalima | 2016-12-03 | 21 | -7375/+0 | |
| * | | | | | | | | | | Merge https://github.com/climbalima/qmk_firmware | climbalima | 2016-12-03 | 3 | -22/+35 | |
| |\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | added plate files for lets split | climbalima | 2016-12-03 | 21 | -0/+7375 | |
| * | | | | | | | | | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware | climbalima | 2016-12-03 | 3 | -2/+5835 | |
| |\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | just saving | climbalima | 2016-11-18 | 10 | -232/+54 | |
* | | | | | | | | | | | | | Merge pull request #933 from priyadi/ps2_mouse_init_user2 | Jack Humbert | 2016-12-04 | 2 | -46/+55 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | syntax error fix | Priyadi Iman Nurcahyo | 2016-12-05 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | Implemented weak ps2_mouse_init_user() | Priyadi Iman Nurcahyo | 2016-12-05 | 2 | -47/+56 | |
|/ / / / / / / / / / / / / | ||||||
| | | | * | | | | | | | | | syntax error fix | Priyadi Iman Nurcahyo | 2016-12-05 | 1 | -1/+1 | |
| | | | * | | | | | | | | | Trackpoint initialization | Priyadi Iman Nurcahyo | 2016-12-05 | 2 | -1/+110 | |
| | | | * | | | | | | | | | Implemented weak ps2_mouse_init_user() | Priyadi Iman Nurcahyo | 2016-12-05 | 2 | -47/+56 | |
| | | | * | | | | | | | | | Merge branch 'master' into promethium | Priyadi Iman Nurcahyo | 2016-12-04 | 103 | -589/+3822 | |
| | | | |\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | cleans-up formatting of readme | Jack Humbert | 2016-12-03 | 1 | -1/+4 | |
| |_|_|_|_|/ / / / / / / |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | Merge pull request #931 from OferPlesser/feature/improve-ps2-mouse | Jack Humbert | 2016-12-03 | 3 | -165/+400 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | Forgot to use define in delay instead of hardcoded number | Ofer Plesser | 2016-12-03 | 1 | -1/+1 | |
| * | | | | | | | | | | | | Updated ps2 mouse documentation in readme | Ofer Plesser | 2016-12-03 | 1 | -1/+111 | |
| * | | | | | | | | | | | | Added back PS2_MOUSE_INIT_DELAY define | Ofer Plesser | 2016-12-03 | 2 | -1/+4 | |
| * | | | | | | | | | | | | Refactored and improved ps2 mouse feature | ofples | 2016-12-03 | 2 | -164/+286 | |
* | | | | | | | | | | | | | Merge pull request #916 from wez/ble_4 | Jack Humbert | 2016-12-03 | 1 | -11/+71 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | Connect the adafruit ble code to the lufa main loop | Wez Furlong | 2016-12-02 | 1 | -11/+71 | |
|/ / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | Merge pull request #930 from cbbrowne/master | Jack Humbert | 2016-12-02 | 13 | -9/+47 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | Adds warnings to Planck keymaps that exceed 0x7000 bytes in size #929 | cbbrowne | 2016-12-02 | 13 | -9/+47 | |
* | | | | | | | | | | | | | Merge pull request #929 from jackhumbert/hf/size-warnings | Jack Humbert | 2016-12-02 | 4 | -4/+12 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | adds warnings to 4 keymaps | Jack Humbert | 2016-12-02 | 4 | -4/+12 | |
|/ / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | Merge pull request #881 from NoahAndrews/patch-1 | Jack Humbert | 2016-12-02 | 1 | -9/+9 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | Recommend WSL on Windows 10 | Noah Andrews | 2016-11-14 | 1 | -9/+9 | |
* | | | | | | | | | | | | | Merge pull request #915 from wez/ble_3 | Jack Humbert | 2016-12-02 | 5 | -1/+940 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | Add support for Adafruit BLE modules | Wez Furlong | 2016-11-27 | 5 | -1/+940 | |
* | | | | | | | | | | | | | | Merge pull request #914 from wez/ble_2 | Jack Humbert | 2016-12-02 | 1 | -0/+37 | |
|\| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | Add arduino-alike GPIO pin control helpers | Wez Furlong | 2016-11-27 | 1 | -0/+37 | |
* | | | | | | | | | | | | | | 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 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / | |/| / / / / / / / / / / / / / / / / / | | |/ / / / / / / / / / / / / / / / / |