Merge with trunk (trivial svn merge URL/trunk)

svn path=/nixpkgs/branches/stdenv-updates/; revision=28799
This commit is contained in:
Yury G. Kudryashov 2011-08-24 21:15:58 +00:00
parent 8e7e316ae1
commit 2b619dd126

View file

@ -566,7 +566,7 @@ with (import ./release-lib.nix);
xwininfo = linux;
};
xfce4 = {
xfce = {
gtk_xfce_engine = linux;
mousepad = linux;
ristretto = linux;