Eelco Dolstra 8af685d089 Merge pull request #13097 from jerith666/antrun ... ant: preserve antRun script		2016-02-18 19:48:12 +01:00
..
applications	spark: 1.4 -> 1.6.	2016-02-18 18:29:44 +01:00
build-support	Merge pull request #13099 from datakurre/datakurre-dockertools	2016-02-18 17:30:54 +01:00
data	wireless-regdb: 2015-12-14 -> 2016-02-08	2016-02-12 00:14:01 +01:00
desktops	Merge pull request #12683 from heydojo/bluetooth--plasma5	2016-02-12 13:49:54 +01:00
development	Merge pull request #13097 from jerith666/antrun	2016-02-18 19:48:12 +01:00
games	Merge pull request #12997 from ryantm/minecraft	2016-02-15 22:14:24 +03:00
misc	Merge branch 'master' into staging	2016-02-17 10:06:31 +01:00
os-specific	Fix sha256 for alsa-tools.	2016-02-18 06:41:40 -05:00
servers	Merge branch 'redis-3.0.7' of https://github.com/kragniz/nixpkgs	2016-02-18 13:30:57 -05:00
shells	fish: don't use manpath(1) from PATH in functions/man.fish	2016-02-02 06:13:12 +01:00
stdenv	bootstrap tools: have curl without http2 support	2016-02-17 10:04:32 +01:00
test
tools	Fix xclip hash, make revision explicit, in stead of depending on HEAD.	2016-02-17 12:00:20 +00:00
top-level	Merge pull request #13065 from DamienCassou/update-pythonPackages.keyring	2016-02-18 16:38:38 +01:00