Vladimír Čunát a6b6f6e049 Merge branch 'staging' ... This is to get security fix for expat soon-ish. Causes ~8k rebuilds; whole staging would be a stdenv rebuild.		2016-05-20 16:33:28 +02:00
..
applications	Merge pull request #15257 from binarin/fix-audacious-icons	2016-05-20 15:15:55 +02:00
build-support	buildFHSUserEnv: don't run bash in login mode for .env	2016-05-20 14:17:49 +03:00
data	nerdfonts: moved to correct location	2016-05-17 01:56:35 +02:00
desktops	gnome-terminal: enable GNOME Shell search provider (for 3.18)	2016-05-19 13:59:16 +02:00
development	Merge branch 'staging'	2016-05-20 16:33:28 +02:00
games	sgtpuzzles: create symlinks with sgt-puzzle- prefix for disambiguation, for example with net being provided by Samba	2016-05-20 11:21:52 +02:00
misc	vimPlugins.YankRing: fixing the build	2016-05-20 10:48:03 +02:00
os-specific	ati-drivers: migrate some patches from gentoo ati-drivers	2016-05-20 13:14:31 +02:00
servers	Merge #15421: mariadb: wrap mysqld with --basedir	2016-05-20 10:50:13 +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	Merge pull request #15578 from ericsagnes/fix/fcitx-wrapper	2016-05-20 15:39:53 +02:00
top-level	borgbackup: unbreak build by using python 3.4 (instead of 3.5)	2016-05-20 16:23:13 +02:00