Merge remote-tracking branch 'origin/core60' into next

Conflicts:
	config/rootfiles/core/59/update.sh
	lfs/strongswan
	make.sh
This commit is contained in:
Arne Fitzenreiter
2012-06-01 17:30:54 +02:00
8 changed files with 107 additions and 4 deletions

View File

@@ -24,7 +24,7 @@
include Config
VER = 4.6.3
VER = 4.6.4
THISAPP = strongswan-$(VER)
DL_FILE = $(THISAPP).tar.bz2
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 34146e514ced1738b4f2d9e7169bbb52
$(DL_FILE)_MD5 = 4c0999c42faa0860ae0afc4f8efd9d04
install : $(TARGET)