Jörg Thalheim 2c95644e69 Merge pull request #38942 from xeji/p/fix-spl ... linuxPackages.splLegacyCrypto: fix build		2018-04-14 18:08:02 +01:00
..
applications	Merge pull request #38916 from mpickering/qgis-darwin-pr	2018-04-14 10:22:48 +01:00
build-support	Merge pull request #38881 from obsidiansystems/sierra-hack	2018-04-13 14:39:56 -04:00
common-updater
data	Merge staging into master	2018-04-11 14:55:52 +02:00
desktops	gnome3: 3.28.0 → 3.28.1	2018-04-14 13:35:45 +02:00
development	Merge pull request #38814 from timokau/rpy2-unbreak	2018-04-14 17:49:42 +01:00
games	wesnoth-dev: 1.13.11 -> 1.13.13	2018-04-14 00:44:25 +02:00
misc	Merge pull request #38898 from r-ryantm/auto-update/gutenprint	2018-04-14 09:22:23 +01:00
os-specific	splLegacyCrypto: fix build	2018-04-14 18:48:19 +02:00
servers	Merge pull request #38857 from yorickvP/oauth2_proxy	2018-04-12 21:10:42 +01:00
shells	Merge branch 'master' into staging	2018-04-10 09:13:36 +02:00
stdenv	Revert "Merge pull request #28029 from cstrahan/hardening-fix"	2018-04-10 19:07:27 -05:00
test
tools	scallion: init at 2.1 (#38817)	2018-04-14 16:55:39 +00:00
top-level	scallion: init at 2.1 (#38817)	2018-04-14 16:55:39 +00:00