Merge branch 'master' of ssh://git@gitorious.org/yacy/rc1.git

This commit is contained in:
sixcooler 2012-05-30 14:47:32 +02:00
commit ae173f4674

View File

@ -60,11 +60,14 @@ SetCompressor /SOLID LZMA
; http://www.java.com/de/download/manual.jsp BundleId +1 / +2
; User-Agent to see the 64bit link: Mozilla/4.0 (compatible; MSIE 8.0; Windows NT 6.0; Win64; x64; Trident/4.0)
; at least we need Java 6
!define JRE_VERSION6 "1.6"
; jre-6u31-windows-i586.exe
!define JRE_32 "http://javadl.sun.com/webapps/download/AutoDL?BundleId=61044"
; jre-6u31-windows-x64.exe
!define JRE_64 "http://javadl.sun.com/webapps/download/AutoDL?BundleId=60338"
; download link Oracle Java 7 Update 4
; 32 bit
!define JRE_32 "http://javadl.sun.com/webapps/download/AutoDL?BundleId=63691"
; 64 bit
!define JRE_64 "http://javadl.sun.com/webapps/download/AutoDL?BundleId=63692"
;!define JRE_32 "http://yacy.berlios.de/download.php?what=jre&version=32&yacyrevnr=@REPL_REVISION_NR@"
;!define JRE_64 "http://yacy.berlios.de/download.php?what=jre&version=64&yacyrevnr=@REPL_REVISION_NR@"