diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2010-10-05 20:30:56 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2010-10-05 20:30:56 +0100 |
| commit | 2bea2079c00772cdb6a6eddd325b24d9998f3624 (patch) | |
| tree | bf5f4ce56cbf11fa20f7c322bf1ea68915d7ef22 /libxmlsec/makefile.mk | |
| parent | 78d8180682dfedfebbf3f55bfe813b5126be9bce (diff) | |
fix up conflict, merge into configure patch
Diffstat (limited to 'libxmlsec/makefile.mk')
| -rw-r--r-- | libxmlsec/makefile.mk | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libxmlsec/makefile.mk b/libxmlsec/makefile.mk index 67dd8a59ae8f..b7dff3e52bed 100644 --- a/libxmlsec/makefile.mk +++ b/libxmlsec/makefile.mk @@ -65,8 +65,7 @@ PATCH_FILES=\ xmlsec1-nssmangleciphers.patch \ xmlsec1-noverify.patch \ xmlsec1-mingw32.patch \ - xmlsec1-mingw-keymgr-mscrypto.patch \ - xmlsec1-nspr.patch + xmlsec1-mingw-keymgr-mscrypto.patch ADDITIONAL_FILES= \ |