summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of https://github.com/qmk/qmk_firmwareJack Humbert2017-05-291-1/+0
|\
| * Merge pull request #1341 from Dbroqua/patch-3Jack Humbert2017-05-291-1/+0
| |\
| | * Update Differences-from-TMK.mdDamien2017-05-291-1/+0
* | | get rid of folders in tarJack Humbert2017-05-291-0/+0
|/ /
* | Merge branch 'master' of https://github.com/qmk/qmk_firmwareJack Humbert2017-05-292-1/+3
|\|
| * Merge pull request #1338 from qmk/hf/prevent_stuck_modsErez Zukerman2017-05-282-1/+3
| |\
| | * Adds prevent stuck modifiers to EZ defaultErez Zukerman2017-05-282-1/+3
| |/
* / more than one en-file, and actually ignore docsJack Humbert2017-05-296-5/+5
|/
* ignore docs, fix tag/hex pushingJack Humbert2017-05-283-3/+11
* Merge pull request #1336 from Dbroqua/patch-2Jack Humbert2017-05-281-1/+1
|\
| * Update Differences-from-TMK.mdDamien2017-05-281-1/+1
|/
* Merge pull request #1334 from fredizzimo/fix_faq_lineendingJack Humbert2017-05-281-237/+237
|\
| * Fix line endings in FAQ.mdFred Sundvik2017-05-281-237/+237
|/
* Updates book.jsonJack Humbert2017-05-271-1/+1
* Updates book.jsonJack Humbert2017-05-271-1/+1
* Updates book.jsonJack Humbert2017-05-271-1/+1
* move book for gitbookJack Humbert2017-05-271-0/+0
* Updates docs/book.jsonJack Humbert2017-05-271-0/+1
* move old doc to docsJack Humbert2017-05-2716-0/+0
* subtree docsJack Humbert2017-05-2747-0/+4807
|\
| * Merge pull request #5 from Maartenwut/patch-1Jack Humbert2017-05-271-2/+2
| |\
| | * Mention that TT needs 5 taps by default.Maarten Dekkers2017-05-271-2/+2
| * | Updates book.jsonJack Humbert2017-05-271-1/+1
| |/
| * Merge pull request #4 from Dbroqua/masterJack Humbert2017-05-261-2/+0
| |\
| | * Merge pull request #1 from Dbroqua/patch-1Damien2017-05-261-2/+0
| |/|
| | * Update Modding-your-keyboard.mdDamien2017-05-261-2/+0
| |/
| * Merge pull request #3 from fieldju/patch-1Jack Humbert2017-05-241-1/+1
| |\
| | * Fix typo in Macro.md in dynamic macro section.Justin Field2017-05-241-1/+1
| |/
| * then some code blocksErez Zukerman2017-05-231-3/+3
| * pipes without backticsErez Zukerman2017-05-231-2/+2
| * grrrErez Zukerman2017-05-231-3/+3
| * surrounds stuff with backticksErez Zukerman2017-05-231-18/+18
| * quick table tweakErez Zukerman2017-05-231-3/+3
| * Merge pull request #2 from Vifon/masterJack Humbert2017-05-211-13/+19
| |\
| | * Update the dynamic macro docs according to the recent changesWojciech Siewierski2017-05-211-13/+19
| |/
| * Merge pull request #1 from Xyverz/masterJack Humbert2017-05-201-1/+1
| |\
| | * Adding punctuation for clarity.xyverz2017-05-201-1/+1
| |/
| * faviconJack Humbert2017-05-203-4/+1
| * faviconJack Humbert2017-05-201-2/+4
| * faviconJack Humbert2017-05-202-2/+3
| * Update SUMMARY.mdJack Humbert2017-05-201-0/+1
| * Update SUMMARY.mdJack Humbert2017-05-201-14/+16
| * Update SUMMARY.mdJack Humbert2017-05-201-7/+9
| * Update book.jsonJack Humbert2017-05-201-1/+1
| * Update book.jsonJack Humbert2017-05-201-1/+1
| * Update book.jsonJack Humbert2017-05-201-2/+6
| * summary testJack Humbert2017-05-151-2/+4
| * Updates book.jsonJack Humbert2017-05-161-1/+1
| * Updates book.jsonJack Humbert2017-05-161-0/+1
| * Updates book.jsonJack Humbert2017-05-161-1/+1