Vladimír Čunát 842420c3e1 Merge branch 'master' into stdenv-updates ... Conflicts (relatively simple): pkgs/development/interpreters/python/2.7/default.nix pkgs/development/libraries/dbus/default.nix pkgs/development/libraries/glib/default.nix pkgs/development/libraries/glibc/2.17/common.nix		2013-06-20 19:21:25 +02:00
..
audio	audacious: update 3.2.2 -> 3.3.4, now needs gtk3	2013-06-20 14:24:19 +02:00
display-managers
editors	Fix attr name to match version	2013-06-19 05:15:05 +03:00
graphics	Merge remote-tracking branch 'upstream/master' into x-updates	2013-06-13 17:12:43 +04:00
misc	Merge branch 'master' into stdenv-updates	2013-06-20 19:21:25 +02:00
networking	skype: update from 4.1.0.20 to 4.2.0.11	2013-06-20 17:13:46 +02:00
office	gnucash: fix build (by removing the obsolete potfiles patch)	2013-06-18 13:11:03 +02:00
science	Adding 'weka'.	2013-06-19 16:19:06 +02:00
search
taxes
version-management	Merge branch 'master' into stdenv-updates	2013-06-20 19:21:25 +02: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