diff options
| author | djm <> | 2012-10-13 21:25:14 +0000 |
|---|---|---|
| committer | djm <> | 2012-10-13 21:25:14 +0000 |
| commit | 942650cdef05a877200cb7aff3a075935a5fd0cd (patch) | |
| tree | 281e0a29ae8f87a8c47fbd4deaa1f3d48b8cc5c1 /src/lib/libcrypto/mdc2/Makefile | |
| parent | 37f091539f73e1650c83acd0c78677ef48c209a6 (diff) | |
| download | openbsd-942650cdef05a877200cb7aff3a075935a5fd0cd.tar.gz openbsd-942650cdef05a877200cb7aff3a075935a5fd0cd.tar.bz2 openbsd-942650cdef05a877200cb7aff3a075935a5fd0cd.zip | |
resolve conflicts
Diffstat (limited to 'src/lib/libcrypto/mdc2/Makefile')
| -rw-r--r-- | src/lib/libcrypto/mdc2/Makefile | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/lib/libcrypto/mdc2/Makefile b/src/lib/libcrypto/mdc2/Makefile index 1d064f17a6..141553149d 100644 --- a/src/lib/libcrypto/mdc2/Makefile +++ b/src/lib/libcrypto/mdc2/Makefile | |||
| @@ -84,10 +84,10 @@ mdc2_one.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h | |||
| 84 | mdc2_one.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h | 84 | mdc2_one.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h |
| 85 | mdc2_one.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h | 85 | mdc2_one.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h |
| 86 | mdc2_one.o: ../../include/openssl/ui_compat.h ../cryptlib.h mdc2_one.c | 86 | mdc2_one.o: ../../include/openssl/ui_compat.h ../cryptlib.h mdc2_one.c |
| 87 | mdc2dgst.o: ../../include/openssl/des.h ../../include/openssl/des_old.h | 87 | mdc2dgst.o: ../../include/openssl/crypto.h ../../include/openssl/des.h |
| 88 | mdc2dgst.o: ../../include/openssl/e_os2.h ../../include/openssl/mdc2.h | 88 | mdc2dgst.o: ../../include/openssl/des_old.h ../../include/openssl/e_os2.h |
| 89 | mdc2dgst.o: ../../include/openssl/opensslconf.h | 89 | mdc2dgst.o: ../../include/openssl/mdc2.h ../../include/openssl/opensslconf.h |
| 90 | mdc2dgst.o: ../../include/openssl/ossl_typ.h ../../include/openssl/safestack.h | 90 | mdc2dgst.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h |
| 91 | mdc2dgst.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h | 91 | mdc2dgst.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h |
| 92 | mdc2dgst.o: ../../include/openssl/ui.h ../../include/openssl/ui_compat.h | 92 | mdc2dgst.o: ../../include/openssl/symhacks.h ../../include/openssl/ui.h |
| 93 | mdc2dgst.o: mdc2dgst.c | 93 | mdc2dgst.o: ../../include/openssl/ui_compat.h mdc2dgst.c |