Peter Hoeg f2e7019346 Merge pull request #30340 from peterhoeg/p/cryfs ... cryfs: init at 0.9.7 and minor updates to dependencies (scrypt and spdlog)		2017-10-13 11:04:27 +08:00
..
applications	atom-beta: 1.22.0-beta0 -> 1.22.0-beta1	2017-10-12 13:17:49 -04:00
build-support	Merge branch 'master' into staging	2017-10-07 10:17:42 +02:00
common-updater	common-updater-script: fix error handling	2017-05-19 17:14:43 +03:00
data	Merge pull request #28216 from volth/fonts-fixed-output-derivations--fontforge-group	2017-10-11 16:25:29 +01:00
desktops	Merge pull request #30354 from peterhoeg/p/sddm-kcm	2017-10-13 09:52:14 +08:00
development	Merge pull request #30340 from peterhoeg/p/cryfs	2017-10-13 11:04:27 +08:00
games	zod: Fix build	2017-10-12 22:07:41 +03:00
misc	Merge pull request #29871 from Ma27/vim-utils/override-capability	2017-10-08 12:58:37 +02:00
os-specific	linux: 4.9.55 -> 4.9.56	2017-10-12 20:02:15 -04:00
servers	Merge pull request #29726 from stesie/v8	2017-10-11 12:21:18 +02:00
shells	antigen: init at 2.2.1 (#27266)	2017-10-10 01:39:04 +01:00
stdenv	Merge branch 'cc-wrapper-stdenvNoCC' into ericson2314-cross-base	2017-09-28 19:12:31 -04:00
test	treewide: Use *Platform.extensions	2017-09-13 11:16:10 -04:00
tools	Merge pull request #30340 from peterhoeg/p/cryfs	2017-10-13 11:04:27 +08:00
top-level	Merge pull request #30340 from peterhoeg/p/cryfs	2017-10-13 11:04:27 +08:00