Michael Raskin 1cce0887ee Merge branch 'master' into mptcp-v91.3		2017-05-01 00:43:08 +02:00
..
applications	Merge pull request #24085 from bcdarwin/ants	2017-04-30 23:03:06 +02:00
build-support	/bin/sh -> ${stdenv.shell}	2017-04-30 17:01:07 +02:00
common-updater
data
desktops	Merge pull request #25285 from ttuegel/qt--fix-plugin-paths	2017-04-30 07:33:50 -05:00
development	Merge pull request #24223 from c0bw3b/pkg/byacc	2017-05-01 00:25:55 +02:00
games	factorio-demo: init at 0.14.23 (#25265)	2017-04-30 02:51:07 +01:00
misc
os-specific	Merge branch 'master' into mptcp-v91.3	2017-05-01 00:43:08 +02:00
servers	Merge pull request #22683 from aneeshusa/add-nixos-test-for-radicale	2017-04-30 18:51:46 +02:00
shells
stdenv	stdenv-generic: add meta attributes checks	2017-04-29 17:07:01 +09:00
test
tools	offlineimap: 7.0.13 -> 7.1.0 (#25342)	2017-05-01 00:06:48 +02:00
top-level	Merge branch 'master' into mptcp-v91.3	2017-05-01 00:43:08 +02:00