summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Modified keymaptak3over2016-04-051-29/+10
* Update tak3over.ctak3over2016-04-041-27/+27
* Merge pull request #2 from jackhumbert/mastertak3over2016-04-0415-1346/+6131
|\
| * Merge pull request #235 from mbarkhau/masterErez Zukerman2016-04-042-92/+123
| |\
| | * add indent to generated keymapManuel Barkhau2016-04-032-92/+123
| * | music mode fileJack Humbert2016-04-036-16/+1725
| * | Merge pull request #213 from mbarkhau/masterErez Zukerman2016-04-034-0/+2890
| |\|
| | * use action function for unicodeManuel Barkhau2016-04-024-2540/+1651
| | * Update compile_keymap.pymbarkhau2016-03-291-13/+11
| | * add hex fileManuel Barkhau2016-03-281-0/+1624
| | * Merge remote-tracking branch 'origin/master'Manuel Barkhau2016-03-2836-1305/+4815
| | |\
| | * | Refactor compiler codeManuel Barkhau2016-03-283-1661/+1900
| | * | Add manuneo layoutManuel Barkhau2016-03-273-0/+1918
| * | | Merge pull request #234 from sboesebeck/masterErez Zukerman2016-04-034-1330/+1349
| |\ \ \
| | * \ \ Merge branch 'master' of https://github.com/sboesebeck/qmk_firmwareStephan Bösebeck2016-04-0284-2017/+4991
| | |\ \ \
| | | * \ \ Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck2016-04-0181-1909/+4883
| | | |\ \ \ | | |_|/ / / | |/| | | |
| * | | | | Merge pull request #233 from tak3over/patch-1Jack Humbert2016-04-011-0/+136
| |\ \ \ \ \
| | * | | | | Create tak3over.ctak3over2016-04-011-0/+136
| |/ / / / /
| | | * | | minor tweaks at the keymap, new png for documentationStephan Bösebeck2016-04-012-6/+6
| | | * | | fixed de_osx prefix in keymap include to avoid conflictsStephan Bösebeck2016-03-312-103/+103
| | * | | | new keymapStephan Bösebeck2016-04-021-1/+9
| | |/ / /
| | * | | added CTL_Shift / Hash macroStephan Bösebeck2016-03-291-11/+24
| | * | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck2016-03-295-18/+55
| | |\ \ \
| | * \ \ \ Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck2016-03-2837-1306/+4820
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | * | | | minor changesStephan Bösebeck2016-03-242-1113/+1111
| | * | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck2016-03-2498-41441/+33775
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck2016-03-224-0/+1309
| | |\ \ \ \ \
| | * | | | | | fix number pad, add ,Stephan Bösebeck2016-03-201-1/+1
| | * | | | | | changing cursor keys, back to "default" cursor key layout, adding ISO-cursor ...Stephan Bösebeck2016-03-201-4/+4
| | * | | | | | tweaking it a bit further, fixing thingsStephan Bösebeck2016-03-201-12/+12
| | * | | | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck2016-03-2011-2963/+3391
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck2016-03-0817-9/+1877
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'master' of https://github.com/sboesebeck/qmk_firmwareStephan Bösebeck2016-03-032-1483/+1481
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | forgot F6Stephan Bösebeck2016-03-022-2/+2
| | | * | | | | | | | updated version, changed F-Key-Layout, minor change in code layerStephan Bösebeck2016-03-022-1481/+1479
| | | * | | | | | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck2016-03-0214-1527/+1761
| | | |\ \ \ \ \ \ \ \
| | * | \ \ \ \ \ \ \ \ Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck2016-03-031-1/+1
| | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | | | |/| | | | | | | |
| | * | | | | | | | | | Merge branch 'master' of https://github.com/jackhumbert/qmk_firmwareStephan Bösebeck2016-02-2413-1526/+1760
| | |\ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / | | |/| | | | | | | | |
| | * | | | | | | | | | testing moving the 6 to the left, having one key more on the right used for h...Stephan Bösebeck2016-02-152-1519/+1561
* | | | | | | | | | | | Merge pull request #1 from tak3over/tak3over-patch-1tak3over2016-04-041-5/+5
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Minor documentation error. Raise and Lower.tak3over2016-04-041-5/+5
|/ / / / / / / / / / /
* | | | | | | | | | | adding files is always smartJack Humbert2016-04-017-0/+327
* | | | | | | | | | | Merge pull request #226 from squisher/dvorak_intl_squisherErez Zukerman2016-04-016-0/+1341
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Also add compiled hex fileDavid Mohr2016-03-301-0/+1127
| * | | | | | | | | | | Squisher's international dvorak variant for ergodox ezDavid Mohr2016-03-305-0/+214
* | | | | | | | | | | | Merge pull request #230 from IBNobody/masterJack Humbert2016-03-311-11/+68
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Drastically rewrote the path script to handle Explorer's stubborn grasp of En...IBNobody2016-03-301-11/+68
|/ / / / / / / / / / /
* | | | | | | | | | | Merge pull request #229 from NoahAndrews/patch-5Jack Humbert2016-03-301-2/+2
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Update README.mdNoah Andrews2016-03-301-2/+2
|/ / / / / / / / / / /
* | | | | | | | | | | Merge pull request #227 from NoahAndrews/patch-4Jack Humbert2016-03-301-2/+2
|\ \ \ \ \ \ \ \ \ \ \