Skip to content

Commit 59d3f68

Browse files
author
Julien Gilli
committed
Merge branch 'v0.12.1-release' into v0.12
Conflicts: ChangeLog
2 parents 7e9d2f8 + 0034086 commit 59d3f68

1,141 files changed

Lines changed: 285004 additions & 295765 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

β€ŽChangeLogβ€Ž

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
2015.03.23, Version 0.12.1 (Stable)
2+
3+
* openssl: upgrade to 1.0.1m (Addressing multiple CVES)
4+
5+
16
2015.02.06, Version 0.12.0 (Stable), 2b18916ff054309a07408719b62e2b6a4f1e056a
27

38
* npm: Upgrade to 2.5.1

β€Ždeps/openssl/asm/x64-win32-masm/aes/vpaesni-x86_64.asmβ€Ž

Whitespace-only changes.

β€Ždeps/openssl/asm/x64-win32-masm/x86_64cpuid.asm.origβ€Ž

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

0 commit comments

Comments
Β (0)