Commit Graph

3993 Commits (0bd03d698c26d95dee11d12a1723976bb470c24a)
 

Author SHA1 Message Date
Jack Humbert a3f726174c Merge pull request #665 from linsomniac/keymap_jafo
8 years ago
Jack Humbert a592c9dcf4 Merge pull request #658 from Xyverz/master
8 years ago
Jack Humbert 7cef0f56e9 Merge pull request #630 from nrrkeene/master
8 years ago
Fred Sundvik fd2f957a1a Normalize line endings
8 years ago
Fred Sundvik f0fd840a57 Add .gitattributes to ensure correct line endings
8 years ago
IBNobody 462e516ad9 Merge
8 years ago
IBNobody 9e3a550840 Merge
8 years ago
IBNobody 2dfe13ac6d fixed color detection routine in makefile
8 years ago
IBNobody e1590abea9 fixed color detection routine in makefile
8 years ago
IBNobody 6bd9235fe3 Merge
8 years ago
Fred Sundvik b26ded3ab1 Comment the Makefile
8 years ago
Fred Sundvik 48f8ab1ae2 Fix the clean target
8 years ago
Xyverz 70d4ea7904 Merge remote-tracking branch 'upstream/master'
8 years ago
Xyverz e4984f65de Changed the Ergodox keymap to use the KEYMAP() macro, updated readme.md.
8 years ago
Xyverz aff792545d Changed my keymap to match normal keymaps.
8 years ago
IBNobody dd553d460e fixed color detection routine in makefile
8 years ago
Nicholas Keene 6a9a6b9477 The Ordinary Layout is boring because all the keys are where you expect them to be
8 years ago
IBNobody 23617779b4 Merge https://github.com/IBNobody/qmk_firmware
8 years ago
Nicholas Keene 8f78ba1f73 The Ordinary Layout is boring because all the keys are where you expect them to be
8 years ago
IBNobody fdaae7ec88 fixed color detection routine in makefile
8 years ago
Sean Reifschneider d98e5ddf30 Tweaks after review.
8 years ago
Sean Reifschneider 9e03517ae5 Restructuring of the ergodox README.
8 years ago
Sean Reifschneider a25480b3b5 Bringing over changes from default map.
8 years ago
Fred Sundvik da226e6126 Update keyboard readme files with new makefile instructions
8 years ago
Fred Sundvik b4c75569b0 Update readme with new instructions for make
8 years ago
Fred Sundvik e1243339ca Add diffutils to travis.yml and install_dependencies
8 years ago
Fred Sundvik ab4d7adbb9 Fix the template for the Makefile/rules.mk split
8 years ago
Fred Sundvik f29730da36 Better format for non-silent output
8 years ago
Fred Sundvik 03e31ef8b9 Continue on error
8 years ago
Fred Sundvik 3442e216dc Move bootloader_defs include to build_keyboard
8 years ago
Fred Sundvik 9028a412ea Add output specific config file
8 years ago
Fred Sundvik 33fbd3be36 Output specific include paths
8 years ago
Fred Sundvik 3aac4e95c9 More general system for generating several outputs
8 years ago
Fred Sundvik 87bf34a5d3 Pass the target to submake
8 years ago
Fred Sundvik d924eb591e Fix variable name clash with builtin
8 years ago
Fred Sundvik 8732265928 Options for silent compilation
8 years ago
Fred Sundvik e4c842de02 Don't run builtin rules for submake
8 years ago
Fred Sundvik 881bde8258 Fix running make in parallel
8 years ago
Fred Sundvik dd8c1a7659 Don't add VERSION as a define
8 years ago
Fred Sundvik 60c6e79ecb Move git submodule check and version generation to main Makefile
8 years ago
Fred Sundvik cc2df445ab Remove unneded code from tmk_core/rules.mk
8 years ago
Fred Sundvik 67b294ca66 Actual compilation
8 years ago
Fred Sundvik db5c3b74fb Add color output
8 years ago
Fred Sundvik 0dd629a990 Fix running make from various subfolders
8 years ago
Fred Sundvik a04bb3a3ba Fixed the shortcut targets
8 years ago
Fred Sundvik 3fa6625869 Proper default goals when inside keyboard fodlers
8 years ago
Fred Sundvik 459ddaceda Add backwards compability with makefile variables
8 years ago
Fred Sundvik 4f20061f66 Proper handling for running make from a subproject or keymap dir
8 years ago
Fred Sundvik 051017c312 Split subproject make files into Makefile and rules.mk
8 years ago
Fred Sundvik c83af54513 Support for running from keyboard directory
8 years ago