Eelco Dolstra 09d06f5ffd Merge remote-tracking branch 'origin/master' into systemd-219 ... Conflicts: pkgs/development/libraries/libseccomp/default.nix		2015-05-22 15:57:36 +02:00
..
applications	Merge remote-tracking branch 'origin/master' into systemd-219	2015-05-22 15:57:36 +02:00
build-support	Add Ubuntu 15.04	2015-05-22 13:21:02 +02:00
data	geolite-legacy -> 2015-05-20	2015-05-20 16:42:38 +02:00
desktops	Remove reference to missing autogen.sh.	2015-05-21 20:37:40 +02:00
development	Merge remote-tracking branch 'origin/master' into systemd-219	2015-05-22 15:57:36 +02:00
games	Add c0dehero as a maintainer of minetest and voxelands	2015-05-17 22:47:36 +02:00
misc	uae: use archive.org links	2015-05-20 16:42:12 +02:00
os-specific	Merge remote-tracking branch 'origin/master' into systemd-219	2015-05-22 15:57:36 +02:00
servers	nginx: Fix build for Darwin (no AIO there)	2015-05-21 12:42:06 -05:00
shells	pythonPackages.ipython: 2.3.1 -> 3.1.0	2015-05-02 22:05:07 +02:00
stdenv	add is{GNU,Clang} attrs to cc-wrapper.	2015-05-11 14:39:36 -07:00
test
tools	Merge pull request #7935 from doublec/tor	2015-05-22 14:48:04 +03:00
top-level	Merge remote-tracking branch 'origin/master' into systemd-219	2015-05-22 15:57:36 +02:00