Vladimír Čunát 1a4ab04e29 Merge branch 'staging' ... There are some darwin failures https://github.com/NixOS/nixpkgs/commit/a3dcb3051#commitcomment-15482351 but also pre-built libxml2 security fixes.		2016-01-18 10:02:48 +01:00
..
applications	Merge branch 'staging'	2016-01-18 10:02:48 +01:00
build-support	Merge branch 'master' into staging	2016-01-18 09:48:49 +01:00
data	hack-font: 2.018 -> 2.019	2016-01-18 02:51:17 +01:00
desktops	cinnamon: remove dead packages	2016-01-14 23:55:47 +01:00
development	Merge branch 'master' into staging	2016-01-18 09:48:49 +01:00
games	Merge pull request #12421 from otwieracz/0ad_0.18_to_0.19	2016-01-17 16:55:24 +01:00
misc	vimPlugins.youcompleteme: patch default python path	2016-01-16 20:21:47 +01:00
os-specific	Merge branch 'master' into staging	2016-01-18 09:48:49 +01:00
servers	Merge branch 'master' into staging	2016-01-18 09:48:49 +01:00
shells	fish: fix merge conflict	2016-01-05 23:32:29 +01:00
stdenv	Merge branch 'master' into staging	2016-01-18 09:48:49 +01:00
test
tools	Merge branch 'master' into staging	2016-01-18 09:48:49 +01:00
top-level	Merge branch 'master' into staging	2016-01-18 09:48:49 +01:00