diff options
| author | Brian Carlstrom <bdc@google.com> | 2013-01-30 18:26:40 -0800 |
|---|---|---|
| committer | Brian Carlstrom <bdc@google.com> | 2013-02-12 11:49:49 -0800 |
| commit | e1142c149e244797ce73b0e7fad40816e447a817 (patch) | |
| tree | 1b21a376dea5f398b558a6e3d2ed4a73667ba2f7 /import_bouncycastle.sh | |
| parent | 2d8d9ce072842c1c67e912686fd20795c43f221d (diff) | |
| download | bouncycastle-e1142c149e244797ce73b0e7fad40816e447a817.tar.gz | |
bouncycastle 1.48 upgrade
Change-Id: Idb04baf42de07b18ddb162e5cd1f98cdadf366f4
Diffstat (limited to 'import_bouncycastle.sh')
| -rwxr-xr-x | import_bouncycastle.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/import_bouncycastle.sh b/import_bouncycastle.sh index a97b060d..52f65f30 100755 --- a/import_bouncycastle.sh +++ b/import_bouncycastle.sh @@ -235,7 +235,7 @@ function applypatches () { # Apply appropriate patches for i in $bouncycastle_patches; do echo "Applying patch $i" - patch -p1 < ../$i || die "Could not apply patches/$i. Fix source and run: $0 regenerate $i" + patch -p1 --merge < ../$i || die "Could not apply patches/$i. Fix source and run: $0 regenerate $i" # make sure no unneeded sources got into the patch problem=0 |