Vladimír Čunát dbae4f109f Merge branch 'master' into staging ... Conflicts (relatively simple): pkgs/applications/audio/spotify/default.nix pkgs/build-support/cc-wrapper/default.nix pkgs/development/compilers/cryptol/1.8.x.nix		2015-01-31 19:34:57 +01:00
..
cinnamon	kerberos: Use default kerberos instead of krb5	2014-12-30 00:05:12 -08:00
e19	rage: fix video for gstreamer engine	2015-01-13 14:59:53 +01:00
enlightenment	Enlightenment 0.16.8.15.	2009-01-22 22:46:39 +00:00
gnome-2	libgnomecups: Add CUPS >= 1.6 compatibility patch.	2014-11-23 18:20:09 +01:00
gnome-3/3.12	gnome-shell: add missing sqlite needed by libcamel	2015-01-08 12:34:12 +01:00
kde-4.14	Merge branch 'master' into staging.	2015-01-19 18:41:17 +01:00
pantheon/apps/pantheon-terminal	Added granite	2014-10-09 01:55:27 +02:00
plasma-5.1	kdeApps: update to 14.12.1	2015-01-26 21:01:06 -06:00
plasma-5.2	kf56, plasma52: use ordinary stdenv	2015-01-28 08:40:27 -06:00
xfce	Adding some plugins to XFCE4	2015-01-17 21:53:23 -02:00