summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2017-05-29Merge pull request #1337 from fredizzimo/wsl_setupJack Humbert5-15/+245
Add script for setting up Windows Subsystem for Linux
2017-05-29Merge branch 'master' of https://github.com/qmk/qmk_firmwareJack Humbert1-1/+0
2017-05-29get rid of folders in tarJack Humbert1-0/+0
2017-05-29Merge pull request #1341 from Dbroqua/patch-3Jack Humbert1-1/+0
Update Differences-from-TMK.md
2017-05-29Merge branch 'master' of https://github.com/qmk/qmk_firmwareJack Humbert2-1/+3
2017-05-29more than one en-file, and actually ignore docsJack Humbert6-5/+5
2017-05-29Update Differences-from-TMK.mdDamien1-1/+0
Removed fn_actions. According this [comment](https://github.com/qmk/qmk_firmware/pull/1336#issuecomment-304634633)
2017-05-29Merge pull request #1338 from qmk/hf/prevent_stuck_modsErez Zukerman2-1/+3
Adds prevent stuck modifiers to EZ default
2017-05-29Adds prevent stuck modifiers to EZ defaultErez Zukerman2-1/+3
2017-05-28ignore docs, fix tag/hex pushingJack Humbert3-3/+11
2017-05-28Update windows 10 instructionsFred Sundvik1-15/+22
2017-05-28Merge pull request #1336 from Dbroqua/patch-2Jack Humbert1-1/+1
Update Differences-from-TMK.md
2017-05-28Create a symlink to qmk if requestedFred Sundvik1-0/+13
2017-05-28Add activate_wsl to .bashrcFred Sundvik2-6/+31
2017-05-28Fix symlink creationFred Sundvik1-1/+1
2017-05-28Use unzip instead of 7zipFred Sundvik1-5/+5
2017-05-28Actually install flip instead of just extractingFred Sundvik2-3/+19
2017-05-28Make symlink to utils and export programmer variablesFred Sundvik2-1/+18
2017-05-28Add install dependenciesFred Sundvik1-4/+18
2017-05-28Add prompt for re-downloading the utilsFred Sundvik1-1/+13
2017-05-28Add driver installationFred Sundvik2-2/+69
2017-05-28Add checks for cloning to the right dirFred Sundvik1-23/+48
2017-05-28Download windows flashing utils and driver_installerFred Sundvik2-0/+34
2017-05-28Update Differences-from-TMK.mdDamien1-1/+1
Hello, I'm not sure but it seems to be uint8_t for TMK/fn_actions (cf. https://github.com/tmk/tmk_keyboard/blob/master/README.md ). Regards, Damien
2017-05-28Merge pull request #1334 from fredizzimo/fix_faq_lineendingJack Humbert1-237/+237
Fix line endings in FAQ.md
2017-05-28Fix line endings in FAQ.mdFred Sundvik1-237/+237
2017-05-28Updates book.jsonJack Humbert1-1/+1
Auto commit by GitBook Editor
2017-05-28Updates book.jsonJack Humbert1-1/+1
Auto commit by GitBook Editor
2017-05-28Updates book.jsonJack Humbert1-1/+1
Auto commit by GitBook Editor
2017-05-28move book for gitbookJack Humbert1-0/+0
2017-05-28Updates docs/book.jsonJack Humbert1-0/+1
Auto commit by GitBook Editor
2017-05-28move old doc to docsJack Humbert16-0/+0
2017-05-28subtree docsJack Humbert47-0/+4807
2017-05-27Merge pull request #5 from Maartenwut/patch-1Jack Humbert1-2/+2
Mention that TT needs 5 taps by default.
2017-05-27Updates book.jsonJack Humbert1-1/+1
Auto commit by GitBook Editor
2017-05-27Mention that TT needs 5 taps by default.Maarten Dekkers1-2/+2
Also gave an example of defining the amount of taps needed.
2017-05-27Merge pull request #1319 from Johannes-Larsson/masterJack Humbert4-0/+130
Add planck/johannes layout
2017-05-27Merge pull request #1327 from Dbroqua/masterJack Humbert10-18/+183
Added Integration of IBM Trackpoint
2017-05-27Merge pull request #1328 from yiancar/qmk_usb_startup_disableJack Humbert2-7/+15
Use variable to disable usb check at startup
2017-05-27Merge pull request #4 from Dbroqua/masterJack Humbert1-2/+0
Update Modding-your-keyboard.md
2017-05-26Use variable to disable usb check at startupyiancar2-7/+15
Adds a define variable which when defined disables the usb startup check. Modified the makefile to separate above define from bluetooth dependancy
2017-05-26Merge pull request #1 from Dbroqua/patch-1Damien1-2/+0
Update Modding-your-keyboard.md
2017-05-26- Added schematic for Trackpoint demonstrationdbroqua2-0/+3
2017-05-26- Added integration of IBM Trackpointdbroqua9-18/+180
2017-05-26Update Modding-your-keyboard.mdDamien1-2/+0
Updated `USART version` chapter. I think there were 2 `#endif` too .
2017-05-26Merge pull request #22 from qmk/masterDamien199-511/+3567
Merge from QMK
2017-05-25Merge pull request #3 from fieldju/patch-1Jack Humbert1-1/+1
Fix typo in Macro.md in dynamic macro section.
2017-05-25Fix typo in Macro.md in dynamic macro section.Justin Field1-1/+1
2017-05-24readme, media keys fixJohannes Larsson3-25/+21
2017-05-24revert changes to config.hJohannes Larsson1-2/+2