Vladimír Čunát 1278859d31 Merge branch 'master' into x-updates ... Conflicts (just splitting version from name): pkgs/os-specific/linux/systemd/default.nix		2013-05-08 13:46:46 +02:00
..
default.nix	Merge branch 'master' into x-updates	2013-05-08 13:46:46 +02:00
dlopen-absolute-paths.diff
dlopen-gtkstyle.diff
dlopen-webkit-nsplugin.diff
glib-2.32.patch