Tuomas Tynkkynen 1a06373c0a Merge remote-tracking branch 'upstream/master' into staging ... Conflicts: pkgs/development/libraries/libclc/default.nix pkgs/top-level/all-packages.nix		2018-02-13 16:42:55 +02:00
..
applications	Merge pull request #34676 from dtzWill/feature/diffpdf-qt5	2018-02-13 13:00:59 +01:00
build-support	Merge branch 'patch-9' of git://github.com/matthewbauer/nixpkgs	2018-02-12 09:33:25 -05:00
common-updater	update-source-version: Name part of name can contain dashes	2017-12-26 20:02:01 +02:00
data	maintainers: capitalize the Profpatsch attribute (vanity)	2018-02-12 07:24:50 +01:00
desktops	Merge pull request #34468 from grwlf/xfce4-weather	2018-02-11 11:56:53 +00:00
development	Merge remote-tracking branch 'upstream/master' into staging	2018-02-13 16:42:55 +02:00
games	Merge pull request #34611 from peterhoeg/p/descent	2018-02-12 22:31:41 +08:00
misc	vim-pencil: init at 2017-06-14	2018-02-12 22:33:41 +01:00
os-specific	Merge remote-tracking branch 'upstream/master' into staging	2018-02-13 16:42:55 +02:00
servers	Merge pull request #34901 from dotlambda/home-assistant	2018-02-12 18:14:55 +00:00
shells	Merge pull request #34689 from dtzWill/fix/zsh-modern	2018-02-09 09:29:32 +00:00
stdenv	check-meta: Use concatStrings	2018-02-11 00:17:47 +02:00
test	sierra-shared-test: fix build	2018-01-05 23:20:55 +01:00
tools	massren: init at 1.5.4	2018-02-12 21:38:43 +01:00
top-level	Merge remote-tracking branch 'upstream/master' into staging	2018-02-13 16:42:55 +02:00