]> git.donarmstrong.com Git - qmk_firmware.git/history - keyboards/ergodox/config.h
Merge remote-tracking branch 'upstream/master'
[qmk_firmware.git] / keyboards / ergodox / config.h
2017-06-22 Erez ZukermanMerge pull request #1331 from ariasuni/master
2017-06-18 Jack HumbertMerge pull request #1349 from jpetermans/infinity60
2017-06-13 Jack HumbertMerge pull request #1387 from antelaurijssen/master
2017-06-10 Jack HumbertMerge pull request #1382 from binaryplease/handwired_bi...
2017-06-06 Jack HumbertMerge pull request #1366 from abperiasamy/refine-layout
2017-06-03 StickMerge remote-tracking branch 'upstream/master'
2017-06-01 Jack HumbertMerge pull request #1350 from originerd/add-originerd...
2017-05-31 Jack HumbertMerge pull request #1348 from Dbroqua/master
2017-05-30 dbroquaMerge remote-tracking branch 'origin/feature/DK60'
2017-05-30 Damien BroquaMerge remote-tracking branch 'origin/feature/DK60'
2017-05-30 Damien BroquaMerge remote-tracking branch 'origin/feature/DK60'
2017-05-30 Nick ChoiMerge pull request #2 from qmk/master
2017-05-29 Jack HumbertMerge pull request #1337 from fredizzimo/wsl_setup
2017-05-29 Jack HumbertMerge branch 'master' of https://github.com/qmk/qmk_fir...
2017-05-29 Erez ZukermanMerge pull request #1338 from qmk/hf/prevent_stuck_mods
2017-05-29 Erez ZukermanAdds prevent stuck modifiers to EZ default
2017-05-27 Jack Humbertsubtree docs
2017-05-26 DamienMerge pull request #22 from qmk/master
2017-05-24 jpetermansMerge branch 'user_led_configuration' into infinity60
2017-05-24 jpetermansMerge remote-tracking branch 'upstream/master' into...
2017-05-24 Jack HumbertMerge pull request #1316 from nikchi/master
2017-05-24 Johannes LarssonMerge branch 'master' of https://github.com/qmk/qmk_fir...
2017-05-24 Erez ZukermanMerge pull request #1317 from qmk/hf/faster_mouse
2017-05-24 Erez Zukermantweaks default mouse speed constants
2017-05-22 Johannes Larssonmerge
2017-05-11 Jack HumbertMerge pull request #1283 from TerryMathews/master
2017-05-08 jpetermansMerge branch 'user_led_configuration' of https://github...
2017-05-08 jpetermansMerge remote-tracking branch 'upstream/master' into...
2017-05-06 coderkunMerge tag '0.5.43' into coderkun_neo2
2017-04-18 Jack HumbertMerge pull request #1235 from siroken3/siroken3
2017-04-13 DamienMerge pull request #20 from qmk/master
2017-04-13 Adam YH LeeMerge branch 'master' into miuni32-OA
2017-04-12 Jack HumbertMerge pull request #1220 from joedevivo/master
2017-04-12 Jack HumbertMerge pull request #1212 from Xyverz/master
2017-04-12 Jack HumbertMerge pull request #1213 from nstickney/master
2017-04-06 StickMerge remote-tracking branch 'upstream/master'
2017-04-04 Adam YH LeeMerge branch 'miuni32-OA'
2017-04-03 StickMerge remote-tracking branch 'upstream/master'
2017-04-01 coderkunMerge branch 'master' into coderkun_neo2
2017-03-29 Zay950Merge branch 'master' into to_push
2017-03-28 StickMerge remote-tracking branch 'upstream/master'
2017-03-12 nstickneyMerge remote-tracking branch 'upstream/master'
2017-03-09 nstickneyMerge remote-tracking branch 'upstream/master'
2017-03-08 nstickneySLASH and WHACK functions added (based on algernon...
2017-02-28 Jack HumbertMerge pull request #1121 from Leszek111/master
2017-02-22 Josh ColbeckMerge remote-tracking branch 'qmk/master'
2017-02-13 Stanley LaiMerge remote-tracking branch 'refs/remotes/qmk/master'
2017-02-07 Jack HumbertMerge pull request #960 from ofples/feature/combos
2017-02-06 Jack HumbertMerge pull request #981 from jonasoberschweiber/osx...
2017-01-27 Jack HumbertMerge pull request #869 from dylanjgscott/master
2017-01-22 Jack HumbertMerge pull request #1022 from lucwastiaux/master
2017-01-15 DamienMerge pull request #16 from jackhumbert/master
2017-01-15 Jack HumbertMerge pull request #987 from belak/belak/whitefox-initi...
2017-01-15 Jack HumbertMerge pull request #1007 from bryan4887/bryan
2017-01-10 Brendan Johan LeeMerge remote-tracking branch 'upstream/master'
2017-01-09 xyverzMerge remote-tracking branch 'upstream/master'
2017-01-09 Jack HumbertMerge pull request #994 from priyadi/unicode_mods_fix
2017-01-09 Jack HumbertMerge pull request #993 from priyadi/greek_layer
2017-01-09 Jack HumbertMerge pull request #990 from replicaJunction/master
2017-01-07 Joshua TMerged from upstream
2017-01-05 Jack HumbertMerge pull request #983 from common-nighthawk/master
2016-12-17 Stanley LaiMerge remote-tracking branch 'refs/remotes/jackhumbert...
2016-12-17 dbroquaMerge branch 'master' of https://github.com/Dbroqua...
2016-12-16 Ofer PlesserMerge branch 'master' into feature/combos
2016-12-11 climbalimaMerge branch 'master' of https://github.com/jackhumbert...
2016-12-10 lucwastiauxMerge remote-tracking branch 'upstream/master'
2016-12-09 DamienMerge pull request #13 from jackhumbert/master
2016-12-07 xyverzMerge remote-tracking branch 'upstream/master'
2016-12-06 Erez ZukermanMerge pull request #936 from jackhumbert/f/shine_default
2016-12-06 Erez ZukermanAdjusts config for better mousekey support
2016-11-22 Jack Humbertfix infinity
2016-11-22 Jack Humbertmerging lets_split
2016-11-17 climbalimaMerge https://github.com/climbalima/qmk_firmware
2016-11-13 Jack Humbertmerging
2016-11-10 Jack HumbertMerge pull request #868 from potz/master
2016-10-18 Ryan AschemanMerge remote-tracking branch 'upstream/master'
2016-10-15 Joshua TMerge remote-tracking branch 'upstream/master'
2016-10-10 Chris BrowneMerge branch 'master' of github.com:cbbrowne/qmk_firmware
2016-10-06 Jack HumbertRGBW lights
2016-09-10 Didier LoiseauMerge remote-tracking branch 'remotes/jackhumbert/maste...
2016-09-01 Joshua TMerge remote-tracking branch 'upstream/master'
2016-08-30 Jason Janse van... Merge branch 'master'
2016-08-25 Joshua TMerge remote-tracking branch 'upstream/master'
2016-08-20 OlivierMerge https://github.com/jackhumbert/qmk_firmware
2016-08-20 IBNobodyMerge https://github.com/IBNobody/qmk_firmware
2016-08-18 Jack HumbertMerge pull request #638 from premek/master
2016-08-13 ToniMerge remote-tracking branch 'origin/master' into iso_s...
2016-08-10 Joshua TMerged branch master into master
2016-08-10 Joshua TReverted Ergodox config.h
2016-08-09 Callum OakleyMerge remote-tracking branch 'upstream/master'
2016-08-08 di0ibMerge remote-tracking branch 'refs/remotes/jackhumbert...
2016-08-04 cbbrowneMerge branch 'master' of https://github.com/jackhumbert...
2016-08-03 Jack HumbertMerge pull request #561 from 0xdec/patch-1
2016-08-03 Stephen ChristieMerge branch 'master' of http://github.com/jackhumbert...
2016-08-01 Jack HumbertMerge pull request #597 from Jiehong/feature/basic_keyb...
2016-07-31 Nathan SharfiMerge branch 'master' of github.com:jackhumbert/qmk_fir...
2016-07-30 Joshua TMerge remote-tracking branch 'upstream/master'
2016-07-30 Jack HumbertMerge pull request #587 from fredizzimo/documentation_q...
2016-07-30 Jack HumbertMerge pull request #503 from fredizzimo/ergodox_subproject
2016-07-29 Fred SundvikMove some of the Ergodox config settings to shared
next