Robin Gloster 1f978b7422 Revert "abook: fix compiling with gcc5" ... This reverts commit 37918bdc7a. has been fixed on master differently		2016-04-03 12:27:29 +00:00
..
applications	Revert "abook: fix compiling with gcc5"	2016-04-03 12:27:29 +00:00
build-support	Merge remote-tracking branch 'upstream/master' into hardened-stdenv	2016-04-03 11:01:57 +00:00
data	tzdata: 2016b -> 2016c	2016-03-31 02:53:31 +02:00
desktops	Merge remote-tracking branch 'upstream/master' into hardened-stdenv	2016-04-03 11:01:57 +00:00
development	spidermonkey.i686-linux: turn off stackprotector hardening	2016-04-03 11:49:13 +00:00
games	Merge remote-tracking branch 'upstream/master' into hardened-stdenv	2016-04-03 11:01:57 +00:00
misc	Merge remote-tracking branch 'upstream/master' into hardened-stdenv	2016-04-03 11:01:57 +00:00
os-specific	Merge remote-tracking branch 'upstream/master' into hardened-stdenv	2016-04-03 11:01:57 +00:00
servers	Merge remote-tracking branch 'upstream/master' into hardened-stdenv	2016-04-03 11:01:57 +00:00
shells	Merge remote-tracking branch 'upstream/master' into hardened-stdenv	2016-04-03 11:01:57 +00:00
stdenv	useOldCXXAbi: Change into a setup hook	2016-04-01 13:36:59 +02:00
test	Replace references to all-packages.nix, by references to the top-level of nixpkgs repository.	2016-03-13 18:25:52 +00:00
tools	stunnel: 5.30 -> 5.31	2016-04-03 11:36:13 +00:00
top-level	Merge remote-tracking branch 'upstream/master' into hardened-stdenv	2016-04-03 11:01:57 +00:00