Vladimír Čunát 4e6b45d0a0 Merge branch 'master' into staging ... ... to get the ffmpeg changes which cause nontrivial rebuilds.		2016-05-17 11:46:37 +02:00
..
applications	virtualboxGuestAdditions: update hash for virtualbox 5.0.20	2016-05-17 08:44:32 +02:00
build-support	fetchurl mirrors: fix gnupg URLs	2016-05-17 11:35:49 +02:00
data	nerdfonts: moved to correct location	2016-05-17 01:56:35 +02:00
desktops	Merge branch 'pr-15453'	2016-05-15 18:19:57 -05:00
development	Merge branch 'master' into staging	2016-05-17 11:46:37 +02:00
games	Bring my stdenv.lib.maintainers user name in line with my github nick.	2016-05-16 22:49:55 +02:00
misc	Merge #15360: xscreensaver: Fix xscreensaver-text	2016-05-17 09:13:59 +02:00
os-specific	mcelog: 136 -> 137	2016-05-17 00:49:57 +02:00
servers	Merge #15360: xscreensaver: Fix xscreensaver-text	2016-05-17 09:13:59 +02:00
shells	zsh-prezto: update to latest and fetch submodules	2016-05-17 01:56:35 +02:00
stdenv	stdenv setup.sh: revert most of changes around #14907	2016-05-12 04:53:37 +02:00
test	Remove cruft	2016-04-26 17:31:54 +02:00
tools	wkhtmltopdf: fix openssl bug (#15443)	2016-05-17 01:35:15 +02:00
top-level	moltengamepad-git: init at 2016-05-04 (#15462)	2016-05-17 08:09:33 +02:00