summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'upstream/master'Xyverz2016-08-1727-108/+1615
|\
| * Merge pull request #648 from Vifon/dynamic_macrosJack Humbert2016-08-172-0/+269
| |\
| | * Add the dynamic macros documentation to the readmeWojciech Siewierski2016-08-181-0/+43
| | * Implement the dynamic macros that are recorded in runtimeWojciech Siewierski2016-08-181-0/+226
| * | Merge pull request #647 from Vifon/process_record_nocache-fixJack Humbert2016-08-171-10/+12
| |\ \
| | * | Fix the process_record_nocache functionWojciech Siewierski2016-08-181-10/+12
| | |/
| * | Merge pull request #645 from algernon/f/tap-dance/bufferingJack Humbert2016-08-175-68/+71
| |\ \
| | * | tap-dance: Major rework, to make it more reliableGergely Nagy2016-08-175-68/+70
| | * | tap-dance: Include action_tapping.h for TAPPING_TERMGergely Nagy2016-08-171-0/+1
| | |/
| * | Merge pull request #640 from toneman77/iso_satanJack Humbert2016-08-179-0/+364
| |\ \
| | * | wring keypress for german iso fixed. prettifiedToni2016-08-171-6/+6
| | * | no more warning thanks to iFreilicht's tip with undefToni2016-08-161-0/+1
| | * | in accordance to keymap_makefile_example.mkToni2016-08-161-12/+12
| | * | minor grammer fixesToni2016-08-161-2/+2
| | * | big cleanup and minor refactoring. thanks iFreilicht.Toni2016-08-166-163/+77
| | * | grammarToni2016-08-151-1/+1
| | * | reference to reddit post and Terry MathewsToni2016-08-151-0/+2
| | * | script now waits for the user to press the buttonToni2016-08-151-2/+26
| | * | readme now with pictureToni2016-08-152-0/+2
| | * | more prettynessToni2016-08-151-2/+2
| | * | Update readme.mdToni2016-08-151-1/+1
| | * | Update readme.mdToni2016-08-151-0/+2
| | * | more information. first steps in markdownToni2016-08-151-1/+15
| | * | readme.md addedToni2016-08-151-0/+16
| | * | removed my personal stuffToni2016-08-152-4/+3
| | * | Merge remote-tracking branch 'origin/master' into iso_split_rshiftToni2016-08-1549-1278/+3141
| | |\|
| | * | increased readability with a definceToni2016-08-141-14/+18
| | * | Merge remote-tracking branch 'origin/master' into iso_split_rshiftToni2016-08-13308-2380/+7761
| | |\ \
| | * | | only aestheticsToni2016-08-121-4/+4
| | * | | new variant with the curly braces on tab layerToni2016-08-071-24/+24
| | * | | enterfn / enterisctrl on hold addedToni2016-08-051-10/+10
| | * | | added homerow-ish bracketsToni2016-07-281-4/+4
| | * | | first try ar adding the parenthesis mess for german isoToni2016-07-271-7/+8
| | * | | Merge remote-tracking branch 'origin/master' into iso_split_rshiftToni2016-07-276-5/+380
| | |\ \ \
| | * \ \ \ Merge remote-tracking branch 'origin/master' into iso_split_rshiftToni2016-07-2597-434/+6778
| | |\ \ \ \
| | * | | | | converted funtions to QMK aliasesToni2016-07-221-32/+23
| | * | | | | more cosmetic changes (whitespace)Toni2016-07-221-1/+1
| | * | | | | purely cosmetic changesToni2016-07-221-42/+42
| | * | | | | changed ctrl back to enter. "j" interfered with my vimmingToni2016-07-191-2/+2
| | * | | | | small cosmetic changeToni2016-07-191-3/+3
| | * | | | | renamed keymapToni2016-07-181-2/+3
| | * | | | | reduced makefile size. not so much needed due to "inheritance"Toni2016-07-181-51/+0
| | * | | | | new modifier "J" is crtlToni2016-07-171-2/+2
| | * | | | | helper file for me to stay up-to-date with masterToni2016-07-171-0/+4
| | * | | | | changes needed for a ISO satan PCB including a split right-shift keyToni2016-07-177-0/+440
| * | | | | | Merge pull request #638 from premek/masterJack Humbert2016-08-173-0/+260
| |\ \ \ \ \ \
| | * | | | | | Update readme.mdPřemek Vyhnal2016-08-161-0/+1
| | * | | | | | premek split layoutpremek2016-08-161-1/+2
| | * | | | | | premek split layoutpremek2016-08-163-0/+258
| | | |_|/ / / | | |/| | | |
| * | | | | | Merge pull request #637 from mld2443/masterJack Humbert2016-08-175-0/+418
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |