Peter Simons 46b0c68ea2 Merge pull request #5282 from rickynils/java-truststore-env ... openjdk: Read SSL truststore from JAVAX_NET_SSL_TRUSTSTORE		2014-12-12 09:22:15 +01:00
..
applications	mpv: update to 0.7.1	2014-12-12 03:16:17 +00:00
build-support	Merge branch 'master' into staging	2014-12-07 14:02:48 +01:00
data	dina-font: fix the installPhase	2014-12-09 17:11:29 -05:00
desktops	kde: fix CVE-2014-8600 by upstream patches	2014-12-10 19:38:50 +01:00
development	Merge pull request #5282 from rickynils/java-truststore-env	2014-12-12 09:22:15 +01:00
games	tibia: update to 10.70	2014-12-10 22:06:28 +00:00
misc	alock: update the package	2014-12-10 17:16:38 +01:00
os-specific	Merge #5286: ati-driver: Update to 4.12	2014-12-11 22:12:20 +01:00
servers	fix builds for rest of kernel modules on 3.18	2014-12-11 02:03:43 +01:00
shells	Merge branch 'master' into staging	2014-12-07 14:02:48 +01:00
stdenv	Merge remote-tracking branch 'origin/bash-4.3' into staging	2014-11-16 22:18:08 +01:00
test
tools	youtube-dl: update to 2014.12.12.1	2014-12-12 03:09:02 +00:00
top-level	nixpkgs: rr 2.0.0 -> 3.0.0, with 64bit support	2014-12-12 01:20:23 -06:00