Skip to content

Commit 17edc37

Browse files
committed
Merge remote-tracking branch 'upstream/master'
2 parents 25e81d7 + 8c327ac commit 17edc37

7 files changed

Lines changed: 2 additions & 29 deletions

File tree

drivers/linux/45-maple.rules

Lines changed: 0 additions & 5 deletions
This file was deleted.

drivers/linux/install-udev-rules.sh

Lines changed: 0 additions & 13 deletions
This file was deleted.

tools/linux/install-udev-rules.sh

Lines changed: 0 additions & 10 deletions
This file was deleted.

tools/macosx/dfu-util/dfu-prefix

22.2 KB
Binary file not shown.

tools/macosx/dfu-util/dfu-suffix

22.2 KB
Binary file not shown.

tools/macosx/dfu-util/dfu-util

46.9 KB
Binary file not shown.

tools/macosx/maple_upload

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,8 @@ else
3939
dfuse_addr=""
4040
fi
4141

42-
DFU_UTIL=/usr/local/bin/dfu-util
42+
#DFU_UTIL=/usr/local/bin/dfu-util
43+
DFU_UTIL=${DIR}/dfu-util/dfu-util
4344
if [ ! -x ${DFU_UTIL} ]; then
4445
DFU_UTIL=/opt/local/bin/dfu-util
4546
fi

0 commit comments

Comments
 (0)