mirror/buildroot
1
0
Fork 0
mirror of https://gitlab.com/buildroot.org/buildroot.git synced 2026-09-29 21:41:43 -09:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'next'

Browse Source 
Conflicts:
	package/e2fsprogs/e2fsprogs.mk
	package/libfuse/libfuse.mk
	package/multimedia/mpd/mpd.mk
	package/smartmontools/smartmontools.mk

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
This commit is contained in:
Peter Korsgaard
2012-09-03 21:33:25 +02:00
parent f9686563b4 dafa32b3bd
commit 32a0454d3c
84 changed files with 2518 additions and 442 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
package/openssl/openssl.mk
View File

@@ -4,7 +4,7 @@
#
#############################################################
OPENSSL_VERSION = 1.0.0j
OPENSSL_VERSION = 1.0.1c
OPENSSL_SITE = http://www.openssl.org/source
OPENSSL_LICENSE = OpenSSL or SSLeay
OPENSSL_LICENSE_FILES = LICENSE