Nikolay Amiantov 3f9cfba02c Merge commit 'refs/pull/14677/head' of git://github.com/NixOS/nixpkgs		2016-04-14 05:14:58 +03:00
..
applications	mass-replace glib and gtk lib/*/include paths	2016-04-14 04:13:54 +03:00
build-support	Merge pull request #14588 from puffnfresh/bug/remove-docker-tarballs	2016-04-13 21:01:01 +02:00
data	tzdata: fixup after merging master	2016-04-02 16:26:32 +02:00
desktops	replace makeSearchPath tree-wise to take care of possible multiple outputs	2016-04-13 22:09:41 +03:00
development	flexcpp: 2.04.00 -> 2.05.00	2016-04-14 02:37:53 +02:00
games	dwarf-therapist: fix build (see #14670)	2016-04-14 04:17:56 +03:00
misc	mass-replace glib and gtk lib/*/include paths	2016-04-14 04:13:54 +03:00
os-specific	replace makeSearchPath tree-wise to take care of possible multiple outputs	2016-04-13 22:09:41 +03:00
servers	replace makeSearchPath tree-wise to take care of possible multiple outputs	2016-04-13 22:09:41 +03:00
shells	Merge branch 'master' into closure-size	2016-04-10 11:17:52 +02:00
stdenv	Merge branch 'master' into closure-size	2016-04-10 11:17:52 +02:00
test	Merge branch 'master' into closure-size	2016-04-01 10:06:01 +02:00
tools	Merge commit 'refs/pull/14677/head' of git://github.com/NixOS/nixpkgs	2016-04-14 05:14:58 +03:00
top-level	daemontools: init at 0.76 (#14675)	2016-04-14 01:32:52 +01:00