William A. Kennington III 354e5af036 Revert "perl: Don't use builtin zlib and bzip2" ... This reverts commit 86f9f5d128.		2015-06-13 10:29:12 -07:00
..
applications	Merge branch 'master.upstream' into staging.upstream	2015-06-12 13:47:46 -07:00
build-support	Merge branch 'master.upstream' into staging.upstream	2015-06-12 13:47:46 -07:00
data	nixos-artwork: only download the necessary artwork	2015-06-12 11:45:58 +02:00
desktops	Merge branch 'master.upstream' into staging.upstream	2015-06-12 13:47:46 -07:00
development	Revert "perl: Don't use builtin zlib and bzip2"	2015-06-13 10:29:12 -07:00
games	chocolate-doom: update from 2.1.0 to 2.2.0	2015-06-10 09:00:47 +02:00
misc	bump dolphinEmuMaster, now needs gcc5 to compile	2015-06-09 03:24:18 -07:00
os-specific	Merge branch 'master.upstream' into staging.upstream	2015-06-12 13:47:46 -07:00
servers	Merge branch 'master.upstream' into staging.upstream	2015-06-12 13:47:46 -07:00
shells	zsh: update from 5.0.7 to 5.0.8	2015-06-08 12:55:38 +02:00
stdenv	stdenv/linux: Link statically against isl & cloog	2015-06-12 01:38:47 +02:00
test
tools	bcache-tools: Add gcc5 compatability patch	2015-06-12 13:57:05 -07:00
top-level	Revert "Net::HTTP: Disable tests"	2015-06-12 13:56:19 -07:00