aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fix attribute heritance for long commands.Erovia2020-01-191-4/+7
* Fix commandline arg merging, small improvementsErovia2020-01-191-3/+3
* MILC: Fix/complete attribute heritanceErovia2020-01-191-2/+15
* [Keyboard] Addition Eagle II keyboard (#7927)Spaceman2020-01-197-0/+185
* [Keyboard] Add mx5160 keyboard (#7142)Maarten Dekkers2020-01-198-0/+459
* [Docs] Misc cleanups for OLED documentation (#7864)fauxpark2020-01-191-112/+115
* Fix unknown key 'IndentPPDirectives' on CI (#7933)Joel Challis2020-01-192-8/+13
* [Keyboard] Rebound keyboard add (#7886)Rossman3602020-01-190-0/+0
* [Keyboard] Rebound keyboard add (#7886)Rossman3602020-01-196-0/+312
* [Keyboard] Add Tartan keyboard (#7917)Takuya Urakawa2020-01-199-0/+893
* Remove tmk_core gitignore and gitmodulesfauxpark2020-01-192-13/+0
* Run clang-format manually to fix recently changed files (#7934)Joel Challis2020-01-1913-218/+170
* Remove custom backlight code for PS2AVRGB boards (#7775)fauxpark2020-01-18101-2802/+474
* Enforce definition of `DIODE_DIRECTION` for non-custom matrix boards (#7915)fauxpark2020-01-1954-6/+120
* Added keymap for Space65 (#7562)James Young2020-01-1811-4/+428
|\
| * updated keys and cleaned up readmeWilliam Chang2020-01-012-21/+20
| * Merge branch 'feature/billiams_space65' of github.com:billiams/qmk_firmware i...William Chang2019-12-082-5/+5
| |\
| | * Update keyboards/gray_studio/space65/keymaps/billiams/keymap.cWilliam Chang2019-12-081-1/+1
| | * Update keyboards/gray_studio/space65/keymaps/billiams/readme.mdWilliam Chang2019-12-081-1/+1
| | * Update keyboards/gray_studio/space65/keymaps/billiams/readme.mdWilliam Chang2019-12-081-1/+1
| | * Update keyboards/gray_studio/space65/keymaps/billiams/readme.mdWilliam Chang2019-12-081-1/+1
| | * Update keyboards/gray_studio/space65/keymaps/billiams/readme.mdWilliam Chang2019-12-081-1/+1
| * | remove unnecessary code from keymapWilliam Chang2019-12-081-40/+0
| |/
| * Added keymap profile to space65William Chang2019-12-073-0/+226
| * update flash script per pull request reviewWilliam Chang2019-12-062-8/+2
| * add layout 2 and rename existing folder to layout 4William Chang2019-11-208-3/+248
| * Merge remote-tracking branch 'upstream/master'William Chang2019-11-206620-501433/+194898
| |\
| * \ Merge branch 'master' of https://github.com/qmk/qmk_firmwareWilliam Chang2019-07-132122-9404/+90836
| |\ \
| * \ \ Merge branch 'master' of https://github.com/billiams/qmk_firmwareWilliam Chang2019-05-100-0/+0
| |\ \ \
| | * \ \ Merge pull request #2 from billiams/feature/billiamsWilliam Chang2019-05-091-1/+1
| | |\ \ \
| | | * | | Updated readmeWilliam Chang2019-05-091-1/+1
| * | | | | fixed conflict in readmeWilliam Chang2019-05-107-21/+268
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge branch 'qmk-master'William Chang2019-05-09671-11435/+22563
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | resolved conflictsWilliam Chang2019-05-09671-11435/+22563
| |/| | | |
| * | | | | updated R_Alt to remove shiftWilliam Chang2019-04-252-4/+3
| * | | | | updated right alt key to apply shift key for emacsWilliam Chang2019-04-252-3/+4
| * | | | | Merge branch 'master' of https://github.com/billiams/qmk_firmwareWilliam Chang2019-04-221-0/+0
| |\ \ \ \ \
| | * | | | | Rename README.md to readme.mdWilliam Chang2019-04-201-0/+0
| * | | | | | swapped media control keysWilliam Chang2019-04-222-7/+6
| |/ / / / /
| * | | | | Merge branch 'master' of https://github.com/billiams/qmk_firmwareWilliam Chang2019-04-201-11/+11
| |\ \ \ \ \
| | * | | | | Update README.mdWilliam Chang2019-04-201-1/+1
| | * | | | | Update README.mdWilliam Chang2019-04-201-5/+5
| | * | | | | Update README.mdWilliam Chang2019-04-201-1/+1
| | * | | | | Update README.mdWilliam Chang2019-04-201-3/+3
| | * | | | | Update README.mdWilliam Chang2019-04-201-1/+1
| | * | | | | Update README.mdWilliam Chang2019-04-201-1/+1
| * | | | | | Made requested changes in PR.William Chang2019-04-201-9/+7
| |/ / / / /
| * | | | | fixed numbering in readmeWilliam Chang2019-04-201-4/+4
| * | | | | Modified keymap and updated readme.William Chang2019-04-203-24/+36
| * | | | | Initial commitWilliam Chang2019-04-204-0/+121