Michael Raskin 19530856ed Merge remote-tracking branch 'upstream/master' into x-updates ... Conflicts: pkgs/development/libraries/cairo/default.nix pkgs/development/libraries/gdk-pixbuf/default.nix pkgs/development/libraries/gtk+/2.x.nix pkgs/misc/ghostscript/default.nix pkgs/top-level/all-packages.nix		2013-06-13 17:12:43 +04:00
..
audio	flac: update, enable tests	2013-06-11 15:48:42 +02:00
display-managers
editors	Merge remote-tracking branch 'upstream/master' into x-updates	2013-06-13 17:12:43 +04:00
graphics	Merge remote-tracking branch 'upstream/master' into x-updates	2013-06-13 17:12:43 +04:00
misc	Merge remote-tracking branch 'upstream/master' into x-updates	2013-06-13 17:12:43 +04:00
networking	Merge remote-tracking branch 'upstream/master' into x-updates	2013-06-13 17:12:43 +04:00
office	Revert "Fixing LibreOffice configure for now"	2013-06-05 22:51:21 +02:00
science	Merge remote-tracking branch 'hydra/master' into x-updates	2013-06-08 15:41:39 +00:00
search	Adding doodle.	2013-04-22 20:57:14 +04:00
taxes
version-management	Merge remote-tracking branch 'upstream/master' into x-updates	2013-06-13 17:12:43 +04:00
video	Merge remote-tracking branch 'upstream/master' into x-updates	2013-06-13 17:12:43 +04:00
virtualization
window-managers	ReRevert Merge x-updates into master	2013-05-29 23:25:02 +02:00