nixpkgs/pkgs/desktops/gnome-2
Vladimír Čunát 0d72174dbd Merge branch stdenv-updates into x-updates
x-updates is supposed to merge after stdenv-updates, so let's test it

Conflicts:
	pkgs/development/libraries/gtk+/2.x.nix (both updated, taking newer)
	pkgs/development/libraries/mesa/default.nix (taking nativeBuildInputs)
2013-02-21 12:43:00 +01:00
..
bindings Add python-rsvg 2012-11-11 18:11:37 +01:00
desktop Rename buildNativeInputs -> nativeBuildInputs 2012-12-28 19:20:09 +01:00
platform Merge branch stdenv-updates into x-updates 2013-02-21 12:43:00 +01:00
default.nix unify intltool 2013-01-31 16:43:52 +01:00