Skip to content

Commit

Permalink
fix conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
@vanhauser-thc
vanhauser-thc committed Nov 10, 2023
1 parent 5d0a53a commit b5e5e74
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion cargo-afl/AFLplusplus
Submodule AFLplusplus updated 19 files
+1 −1 .custom-format.py
+17 −15 afl-cmin
+36 −50 afl-cmin.bash
+0 −2 docs/Changelog.md
+2 −3 docs/custom_mutators.md
+4 −4 frida_mode/src/main.c
+1 −1 include/afl-mutations.h
+15 −15 include/xxhash.h
+1 −1 instrumentation/cmplog-instructions-pass.cc
+1 −1 instrumentation/cmplog-routines-pass.cc
+1 −1 instrumentation/cmplog-switches-pass.cc
+1 −1 instrumentation/split-switches-pass.so.cc
+19 −19 qemu_mode/libqasan/dlmalloc.c
+2 −2 qemu_mode/libqasan/malloc.c
+2 −25 src/afl-common.c
+2 −3 src/afl-fuzz-extras.c
+15 −16 src/afl-fuzz-one.c
+1 −1 src/afl-fuzz-redqueen.c
+3 −3 utils/libtokencap/libtokencap.so.c

0 comments on commit b5e5e74

Please sign in to comment.