diff options
| author | Nathan Sharfi <me@ngalt.com> | 2016-07-31 14:02:25 -0700 |
|---|---|---|
| committer | Nathan Sharfi <me@ngalt.com> | 2016-07-31 14:02:25 -0700 |
| commit | d889648d5373b7ff77dc7bc4b369c628e8336b45 (patch) | |
| tree | 35c6eb194417242958baf54b36f0ff3a56e378f1 /tmk_core/protocol/lufa/LUFA-git/LUFA | |
| parent | 6428069eb70f5cc47ac1f3f9acf3daea14fb9097 (diff) | |
| parent | b25dbc484d639210c53d8e13f79cf5a77f2faaaa (diff) | |
Merge branch 'master' of github.com:jackhumbert/qmk_firmware
# Conflicts:
# keyboard/ergodox_ez/keymaps/zweihander-osx/keymap.c
# keyboard/ergodox_ez/keymaps/zweihander-osx/zweihander-osx.hex
Diffstat (limited to 'tmk_core/protocol/lufa/LUFA-git/LUFA')
| -rw-r--r-- | tmk_core/protocol/lufa/LUFA-git/LUFA/StudioIntegration/makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tmk_core/protocol/lufa/LUFA-git/LUFA/StudioIntegration/makefile b/tmk_core/protocol/lufa/LUFA-git/LUFA/StudioIntegration/makefile index 2649598d9f..9d6329b5fe 100644 --- a/tmk_core/protocol/lufa/LUFA-git/LUFA/StudioIntegration/makefile +++ b/tmk_core/protocol/lufa/LUFA-git/LUFA/StudioIntegration/makefile @@ -109,7 +109,7 @@ generate_vsix: $(EXTENSION_OUTPUT_XML) $(MODULE_OUTPUT_XML) $(MSHELP_OUTPUT_XML) @echo Archiving XDK content... @rm -f contents.zip - @cd $(LUFA_ROOT)/../ && zip contents.zip -q -0 -r --exclude=*Documentation* --exclude=*StudioIntegration* LUFA Bootloaders Demos Projects README.txt + @cd $(LUFA_ROOT)/../ && zip contents.zip -q -0 -r --exclude=*Documentation* --exclude=*StudioIntegration* LUFA Bootloaders Demos Projects readme.txt @echo Creating VSIX dependencies... @cp $(VSIX_ASSETS) $(LUFA_ROOT)/.. |