Commit Graph

3 Commits

Author SHA1 Message Date
eb66583ee3 Merge branch '3.5' into 3.6
Conflicts:
	jdk8-bin/.signature
	jdk8-bin/Pkgfile
2020-11-07 14:17:10 +00:00
c68e000a61 Merge branch '3.5' into 3.6
Conflicts:
	jdk8-bin/.signature
	jdk8-bin/Pkgfile
	nfs-utils/.signature
	python3-pip/.footprint
	python3-pip/.signature
	python3-setuptools/.footprint
	python3-setuptools/.signature
	python3-setuptools/Pkgfile
2020-10-24 10:13:16 +00:00
b73ba197b4 jdk: renamed to jdk8-bin 2020-09-25 08:38:04 +00:00