summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | Merge branch 'master' of github.com:jackhumbert/qmk_firmwareNathan Sharfi2016-07-316362-2418080/+66593
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | |
| * | | | | | | zweihander-osx: Use power instead of ejectNathan Sharfi2016-05-312-3/+3
| * | | | | | | zweihander-osx: use eject instead of powerNathan Sharfi2016-05-312-1110/+1097
| * | | | | | | Merge branch 'master' of github.com:jackhumbert/qmk_firmwareNathan Sharfi2016-05-312-4/+9
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' of github.com:jackhumbert/qmk_firmwareNathan Sharfi2016-05-3036-96/+3634
| |\ \ \ \ \ \ \ \
| * | | | | | | | | zweihander: Add :, disable sleep LED wavesNathan Sharfi2016-05-302-1/+3
| * | | | | | | | | zweihander-osx: Add =, :, juggle Home/EndNathan Sharfi2016-05-271-8/+8
| * | | | | | | | | zweihander-osx: Bump ALFRED_LEAD_TIME to 250msNathan Sharfi2016-05-262-5/+5
* | | | | | | | | | correct file nameJack Humbert2016-08-011-1/+1
* | | | | | | | | | fix mkdir cmdJack Humbert2016-08-011-1/+1
* | | | | | | | | | Updates ErgoDox readmeErez Zukerman2016-08-011-9/+6
* | | | | | | | | | automatically forward ergodox ezJack Humbert2016-08-012-0/+3
* | | | | | | | | | Merge pull request #597 from Jiehong/feature/basic_keyboard_docJack Humbert2016-08-011-0/+96
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | feature: add basic doc about how a keyboard works on USBJiehong Ma2016-07-311-0/+96
* | | | | | | | | | | Merge pull request #596 from fredizzimo/rid_of_quickJack Humbert2016-08-0110-56/+87
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Travis calls the normal build target, instead of quickFred Sundvik2016-07-311-1/+1
| * | | | | | | | | | Fix the readme for the removed quick targetFred Sundvik2016-07-311-4/+3
| * | | | | | | | | | Remove the quick commands and add proper cleanFred Sundvik2016-07-311-26/+5
| * | | | | | | | | | Also depend on the gcc versionFred Sundvik2016-07-311-3/+5
| * | | | | | | | | | Generate version information to version.hFred Sundvik2016-07-317-2/+10
| * | | | | | | | | | Force compilation and linking when options changesFred Sundvik2016-07-311-9/+28
| * | | | | | | | | | More reliable .d file generationFred Sundvik2016-07-311-8/+16
| * | | | | | | | | | Put the build output inside the root/.build directoryFred Sundvik2016-07-311-1/+2
| * | | | | | | | | | Enable vpath seraching for source files onlyFred Sundvik2016-07-311-1/+11
| * | | | | | | | | | Better "include guards" for the makefilesFred Sundvik2016-07-311-9/+14
| | |_|_|_|_|_|/ / / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #594 from jeebak/jeebakJack Humbert2016-07-313-0/+496
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Update readme.mdJeeBak Kim2016-07-301-1/+106
| * | | | | | | | | | Add additional shortcut keymaps to TOUCHCURSOR layerJeeBak Kim2016-07-301-4/+7
| * | | | | | | | | | Add additional maps for [, and ], to LOWERJeeBak Kim2016-07-301-4/+4
| * | | | | | | | | | Make RAISE layer an all numbers/arithmatic layerJeeBak Kim2016-07-301-6/+6
| * | | | | | | | | | Move reset to a less accessible locationJeeBak Kim2016-07-301-4/+4
| * | | | | | | | | | Add -, +, and . to RAISEJeeBak Kim2016-07-301-4/+4
| * | | | | | | | | | Change calls from persistant_default_layer_set() to default_layer_set()JeeBak Kim2016-07-301-3/+3
| * | | | | | | | | | PrintScreen and RGUI replace BACKLIT and Ctrl. Move BACKLIT to LOWER/RAISE la...JeeBak Kim2016-07-301-10/+10
| * | | | | | | | | | Media keys for all the "regular" layersJeeBak Kim2016-07-301-10/+10
| * | | | | | | | | | Add mouse layer, and remove default arrow keys (touchcursor only, now)JeeBak Kim2016-07-301-15/+36
| * | | | | | | | | | Add numbers to _RAISEJeeBak Kim2016-07-301-4/+4
| * | | | | | | | | | Move _RAISE symbols to _LOWERJeeBak Kim2016-07-301-6/+6
| * | | | | | | | | | Tap for Enter, hold for ShiftJeeBak Kim2016-07-301-30/+31
| * | | | | | | | | | Add personalized TouchCursor layerJeeBak Kim2016-07-301-6/+28
| * | | | | | | | | | Tap for Esc, hold for ControlJeeBak Kim2016-07-301-30/+33
| * | | | | | | | | | Add "jeebak" keymap folder as a copy of the "default" folderJeeBak Kim2016-07-303-0/+341
| |/ / / / / / / / /
* | | | | | | | | | Merge pull request #590 from jeebak/in-like-flintJack Humbert2016-07-311-0/+8
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Add IN_LIKE_FLINT songJeeBak Kim2016-07-301-0/+8
|/ / / / / / / / /
* | | | | | | | | Merge pull request #589 from algernon/h/ergodox_ez-vs-ergodoxJack Humbert2016-07-307-9/+9
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | / / / | | |_|_|_|/ / / | |/| | | | | |
| * | | | | | | Update some obsolete referencesGergely Nagy2016-07-307-9/+9
|/ / / / / / /
* | | | | | | Merge pull request #587 from fredizzimo/documentation_quick_fixJack Humbert2016-07-291-13/+15
|\ \ \ \ \ \ \
| * | | | | | | Fix the quick aliases documentation sectionFred Sundvik2016-07-291-13/+15
* | | | | | | | Merge pull request #503 from fredizzimo/ergodox_subprojectJack Humbert2016-07-29225-1795/+1651
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Small fix for infinity include guardFred Sundvik2016-07-291-3/+3