Nikolay Amiantov 8b92103ae8 Merge branch 'master' into staging		2016-07-08 20:36:44 +03:00
..
applications	slack: 2.0.3 -> 2.1.0	2016-07-07 08:44:05 -04:00
build-support	nix-prefetch-git: unbreak JSON output	2016-07-04 14:39:47 +02:00
data	symbola: fix hash mismatch due to new upstream release	2016-07-07 07:29:58 -06:00
desktops	Merge pull request #16747 from DamienCassou/move-gnome3.18-to-3.20	2016-07-08 19:32:13 +02:00
development	pythonPackages.breathe: init at 4.2.0	2016-07-08 14:54:44 +02:00
games	Merge pull request #16739 from vrthra/15994	2016-07-07 14:22:52 +04:00
misc	Build libjack2 for supercollider with same GCC	2016-07-07 16:07:47 +02:00
os-specific	Merge branch 'master' into staging	2016-07-08 20:36:44 +03:00
servers	Merge pull request #16798 from roblabla/feature-matrix-0.16.1r1	2016-07-08 16:06:11 +02:00
shells	Merge pull request #16589 from vrthra/elvish	2016-07-02 15:35:49 +02:00
stdenv	make-bootstrap-tools: try again to fix on Darwin	2016-07-03 16:34:47 +02:00
test	Remove cruft	2016-04-26 17:31:54 +02:00
tools	lzfse: init at 2016-06-21	2016-07-08 13:09:16 +03:00
top-level	Merge branch 'master' into staging	2016-07-08 20:36:44 +03:00