Vladimír Čunát 7db886fdb9 Merge remote-tracking branch 'hydra/master' into x-updates ... Conflicts (taken from @7c6f434c): pkgs/development/libraries/libgphoto2/default.nix		2013-06-08 15:41:39 +00:00
..
e17	add terminology: e17 terminal emulator	2013-04-04 22:18:08 +02:00
enlightenment	Enlightenment 0.16.8.15.	2009-01-22 22:46:39 +00:00
gnome-2	ReRevert Merge x-updates into master	2013-05-29 23:25:02 +02:00
gnome-3	ReRevert Merge x-updates into master	2013-05-29 23:25:02 +02:00
kde-4.7	Fix KDE 4.8 and 4.7 build against new SIP	2013-05-06 22:15:07 +03:00
kde-4.8	Fix KDE 4.8 and 4.7 build against new SIP	2013-05-06 22:15:07 +03:00
kde-4.10	KDE 4.10: update to 4.10.4	2013-06-05 19:41:28 +03:00
xfce	ReRevert Merge x-updates into master	2013-05-29 23:25:02 +02:00