Vladimír Čunát b1eeae8cac Merge branch 'master' into x-updates ... Conflicts (easy): pkgs/desktops/xfce/core/xfdesktop.nix pkgs/development/libraries/cairo/default.nix pkgs/development/libraries/pango/default.nix		2013-03-17 11:28:28 +01:00
..
audio	Merge pull request #380 from oxij/random-updates	2013-03-16 11:40:06 -07:00
display-managers/slim	consolekit: Remove	2012-12-13 11:30:18 +01:00
editors	emacs: update to version 24.3	2013-03-11 19:18:31 +01:00
graphics	Merge branch 'master' into x-updates	2013-03-17 11:28:28 +01:00
misc	Merge branch 'master' into x-updates	2013-03-17 11:28:28 +01:00
networking	elinks: allow building without guile	2013-03-16 13:39:30 +01:00
office	Merge branch 'master' into x-updates	2013-03-09 17:55:37 +01:00
science	Merge branch 'master' into x-updates	2013-03-09 17:55:37 +01:00
taxes
version-management	Merge branch 'master' into x-updates	2013-03-17 11:28:28 +01:00
video	upgrade xbmc to 12.0	2013-03-12 01:35:16 +01:00
virtualization	Merge branch 'master' into stdenv-updates	2013-03-02 10:41:53 +01:00
window-managers	Merge remote-tracking branch 'upstream/x-updates' into wayland	2013-03-10 18:19:49 +01:00