Yury G. Kudryashov 5299c1f6fb svn merge ^/nixpkgs/trunk ... - 1 conflict (gnome-doc-utils) - final merge before --reintegrate svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33500		2012-03-31 20:01:40 +00:00
..
custom.nix	Fixing how bzip2 is passed to nixCustom	2012-03-30 10:18:25 +00:00
default.nix	* Disable make check because it fails randomly due to a race.	2012-01-23 12:34:07 +00:00
unstable.nix	* Update nixUnstable.	2012-03-29 22:10:24 +00:00