diff options
| author | Balz Guenat <balz.guenat@gmail.com> | 2017-08-12 12:14:33 +0200 |
|---|---|---|
| committer | Balz Guenat <balz.guenat@gmail.com> | 2017-08-12 12:14:33 +0200 |
| commit | 430151dd51b8b0d925850ad4d52c8bae41d3c154 (patch) | |
| tree | f3d13283dd812277bc30d75dff32ea16508b58c8 /tmk_core | |
| parent | 175db1a549a46518c2f2511ac1624d594eb07216 (diff) | |
| parent | 5ad103fa51083cb26d3516e5598b7b2a099b1521 (diff) | |
| download | firmware-430151dd51b8b0d925850ad4d52c8bae41d3c154.tar.gz firmware-430151dd51b8b0d925850ad4d52c8bae41d3c154.tar.bz2 firmware-430151dd51b8b0d925850ad4d52c8bae41d3c154.zip | |
Merge remote-tracking branch 'upstream/master'
# Conflicts:
# docs/faq_keymap.md
Diffstat (limited to 'tmk_core')
| -rw-r--r-- | tmk_core/rules.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tmk_core/rules.mk b/tmk_core/rules.mk index b7cb0a559..be06d611b 100644 --- a/tmk_core/rules.mk +++ b/tmk_core/rules.mk @@ -382,7 +382,7 @@ $(eval $(foreach OUTPUT,$(OUTPUTS),$(shell mkdir -p $(OUTPUT) 2>/dev/null))) # Listing of phony targets. -.PHONY : all finish sizebefore sizeafter gccversion \ -build elf hex eep lss sym coff extcoff \ +.PHONY : all finish sizebefore sizeafter qmkversion \ +gccversion build elf hex eep lss sym coff extcoff \ clean clean_list debug gdb-config show_path \ program teensy dfu flip dfu-ee flip-ee dfu-start
\ No newline at end of file |