obadz 1047ed49d9 Merge branch 'master' into staging ... Conflicts: pkgs/os-specific/linux/kmod/default.nix cc @abbradar		2016-08-19 15:28:58 +01:00
..
applications	weechat: add python & perl to PATH so that extensions can run	2016-08-19 13:48:35 +01:00
build-support	emacs: add versatile "emacsWrapper"	2016-08-17 18:19:58 +00:00
data	nerdfonts: 0.7.0 -> 0.8.0, fixes #17693	2016-08-17 14:06:28 +02:00
desktops	kde5.applications: 16.04.3 -> 16.08.0	2016-08-18 21:02:28 -05:00
development	Merge branch 'master' into staging	2016-08-19 15:28:58 +01:00
games	factorio: Fix the fetch script (#17741)	2016-08-14 22:47:00 +00:00
misc	Greybird: 2016-03-11 -> 2016-08-16	2016-08-18 11:23:05 -03:00
os-specific	Merge branch 'master' into staging	2016-08-19 15:28:58 +01:00
servers	redstore: add home page and license fields	2016-08-17 22:43:06 +02:00
shells	buildGoPackage: remove Go deps file libs.json	2016-08-11 23:07:09 +02:00
stdenv	Revert "Merge branch 'modprobe-fix' of git://github.com/abbradar/nixpkgs"	2016-08-15 19:05:52 -04:00
test
tools	unar: init at 1.10.1 (#17830)	2016-08-19 13:44:19 +02:00
top-level	Merge pull request #17836 from vbgl/topkg_0.7.8	2016-08-19 13:48:33 +02:00