Franz Pletz 098680e78e Revert "Revert "bash: 4.3-p42 -> 4.3-p46"" ... This reverts commit 36e75a2285. Sorry, had bash reverted temporarily to test the build of the sqlite bump and forgot to remove that commit.		2016-08-26 17:08:58 +02:00
..
applications	treewide: fix darwin builds by using getOutput	2016-08-25 08:44:20 +00:00
build-support	Merge remote-tracking branch 'origin/master' into hardened-stdenv	2016-08-24 11:01:53 +02:00
data	Merge pull request #17847 from DamienCassou/cantarell-0.0.25	2016-08-23 10:51:26 +02:00
desktops	Merge remote-tracking branch 'origin/master' into hardened-stdenv	2016-08-24 11:01:53 +02:00
development	sqlite: 3.13.0 -> 3.14.1	2016-08-26 17:08:04 +02:00
games	Revert "crawl: fix build with multiple outputs"	2016-08-24 20:18:52 +00:00
misc	moltengamepad: disable format hardening	2016-08-25 03:55:20 +02:00
os-specific	treewide: fix darwin builds by using getOutput	2016-08-25 08:44:20 +00:00
servers	memcached: disable treating warnings as errors on darwin	2016-08-24 21:44:41 +02:00
shells	Revert "Revert "bash: 4.3-p42 -> 4.3-p46""	2016-08-26 17:08:58 +02:00
stdenv	Revert "Revert "Merge branch 'modprobe-fix' of git://github.com/abbradar/nixpkgs""	2016-08-24 07:35:30 -04:00
test
tools	gnupg21: Removes previously backported patch	2016-08-25 12:26:22 +02:00
top-level	automake110x: remove unused package	2016-08-24 21:07:59 +00:00