aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* In Progress MergeIBNobody2016-08-204-18/+137
* Initial CommmitIBNobody2016-08-2010-1/+387
* MergeIBNobody2016-08-201-356/+194
* MergeIBNobody2016-08-200-0/+0
|\
| * MergeIBNobody2016-08-200-0/+0
| |\
| | * Merge https://github.com/IBNobody/qmk_firmwareIBNobody2016-08-191-22/+22
| | |\
| | | * fixed color detection routine in makefileIBNobody2016-06-111-30/+28
| | | * Merge remote-tracking branch 'remotes/jackhumbert/master'IBNobody2016-06-11728-90650/+141429
| | | |\
| | | * \ Merge remote-tracking branch 'remotes/jackhumbert/master'IBNobody2016-05-2432-792/+626
| | | |\ \
| | | * \ \ Merge remote-tracking branch 'remotes/jackhumbert/master'IBNobody2016-05-24124-4257/+11726
| | | |\ \ \
| | | * \ \ \ Merge remote-tracking branch 'refs/remotes/jackhumbert/master'IBNobody2016-05-02142-10819/+28668
| | | |\ \ \ \
| | * | | | | | fixed color detection routine in makefileIBNobody2016-08-191-194/+356
| * | | | | | | fixed color detection routine in makefileIBNobody2016-08-191-194/+356
| |/ / / / / /
* | | | | | | fixed color detection routine in makefileIBNobody2016-08-201-194/+195
* | | | | | | fixed color detection routine in makefileIBNobody2016-08-201-0/+161
|/ / / / / /
* | | | | | Merge pull request #662 from toneman77/iso_satanJack Humbert2016-08-196-85/+117
|\ \ \ \ \ \
| * | | | | | made a correct default KEYMAP. moved the old one to KEYMAP_ANSIToni2016-08-185-59/+86
| * | | | | | cleanup, readability , shift swap in ISO_SPLIT_RSHIFTToni2016-08-181-17/+20
| * | | | | | corrected the split rshift key to realityToni2016-08-182-9/+11
* | | | | | | Merge pull request #663 from tomb0y/kc60_workman_deadJack Humbert2016-08-193-0/+200
|\ \ \ \ \ \ \
| * | | | | | | Add the workman-dead layout for kc60zs2016-08-193-0/+200
* | | | | | | | Merge pull request #660 from toneman77/amj60Jack Humbert2016-08-1910-0/+650
|\ \ \ \ \ \ \ \
| * | | | | | | | forgot media keysToni2016-08-191-1/+1
| * | | | | | | | Merge remote-tracking branch 'origin/master' into amj60Toni2016-08-1952-95/+5750
| |\ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
* | | | | | | | | Merge pull request #655 from Dbroqua/patch-1Jack Humbert2016-08-181-0/+314
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Added dbroqua layout for planck keyboardDamien2016-08-181-0/+314
* | | | | | | | | | Merge pull request #656 from Vifon/dynamic_macrosJack Humbert2016-08-181-2/+6
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Improve the dynamic macro documentationWojciech Siewierski2016-08-191-2/+6
|/ / / / / / / / /
* | | | | | | | | Merge pull request #652 from iFreilicht/masterJack Humbert2016-08-1841-0/+5228
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Added info to docsFelix Uhl2016-08-181-1/+1
| * | | | | | | | | Merge pull request #1 from jackhumbert/masterFelix Uhl2016-08-18115-1531/+6981
| |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | | | |
| * | | | | | | | | BugfixesFelix Uhl2016-08-181-6/+7
| * | | | | | | | | Final link fixFelix Uhl2016-08-181-2/+2
| * | | | | | | | | More link fixingFelix Uhl2016-08-181-6/+6
| * | | | | | | | | Fixed links againFelix Uhl2016-08-181-2/+2
| * | | | | | | | | Fixed dead linkFelix Uhl2016-08-181-1/+1
| * | | | | | | | | Minor documentation changesFelix Uhl2016-08-182-28/+21
| * | | | | | | | | Fixed links againFelix Uhl2016-08-181-3/+5
| * | | | | | | | | Fixed pictures and linksFelix Uhl2016-08-181-15/+13
| * | | | | | | | | Documentation overhaul.Felix Uhl2016-08-1810-9/+3138
| * | | | | | | | | Small changes, renamed keymapFelix Uhl2016-08-184-213/+236
| * | | | | | | | | Minor changes to felix keymapFelix Uhl2016-08-153-17/+54
| * | | | | | | | | Ported all keymapsFelix Uhl2016-08-1414-92/+115
| * | | | | | | | | Update readme.mdFelix Uhl2016-08-141-1/+1
| * | | | | | | | | Fixed links to keymap sourcesFelix Uhl2016-08-141-14/+13
| * | | | | | | | | Added all original S60-X keymapsFelix Uhl2016-08-1428-150/+1579
| * | | | | | | | | Small changesFelix Uhl2016-08-112-9/+10
| * | | | | | | | | Minor changes to keymapsFelix Uhl2016-08-113-9/+12
| * | | | | | | | | Added S60-X to keyboards with two layouts.Felix Uhl2016-08-1112-0/+590
* | | | | | | | | | Merge pull request #651 from algernon/f/register16Jack Humbert2016-08-183-4/+44
|\ \ \ \ \ \ \ \ \ \