Vladimír Čunát bf4313cd88 update gsettings-desktop-schemas and make system-wide ... Conflicts: pkgs/data/misc/gsettings-desktop-schemas/default.nix pkgs/desktops/gnome-3/core/gsettings-desktop-schemas/default.nix		2013-02-21 20:42:39 +01:00
..
applications	Merge branch stdenv-updates into x-updates	2013-02-21 12:43:00 +01:00
build-support	Merge branch stdenv-updates into x-updates	2013-02-21 12:43:00 +01:00
data	update gsettings-desktop-schemas and make system-wide	2013-02-21 20:42:39 +01:00
desktops	update gsettings-desktop-schemas and make system-wide	2013-02-21 20:42:39 +01:00
development	gnome3: port and update (lib)gnome-keyring	2013-02-21 20:36:20 +01:00
games	Merge remote-tracking branch 'upstream/master' into stdenv-updates	2013-02-17 08:19:40 -05:00
lib	Merge branch stdenv-updates into x-updates	2013-02-21 12:43:00 +01:00
misc	Merge branch stdenv-updates into x-updates	2013-02-21 12:43:00 +01:00
os-specific	Merge branch 'upstream-master' into stdenv-updates	2013-02-19 10:09:39 -05:00
servers	Merge remote-tracking branch 'origin/master' into stdenv-updates	2013-02-15 13:36:34 +01:00
shells	Merge remote-tracking branch 'origin/master' into stdenv-updates	2013-02-15 13:36:34 +01:00
stdenv	Merge remote-tracking branch 'origin/master' into stdenv-updates	2013-02-15 13:36:34 +01:00
test
tools	Merge branch 'upstream-master' into stdenv-updates	2013-02-19 10:09:39 -05:00
top-level	update gsettings-desktop-schemas and make system-wide	2013-02-21 20:42:39 +01:00