nixpkgs/pkgs/data
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
..
documentation svn merge ^/nixpkgs/trunk 2012-03-31 20:01:40 +00:00
fonts Merge ^/nixpkgs/trunk. 2012-03-28 15:42:42 +00:00
misc Move gsettings-desktop-schemas to data/misc 2012-03-08 22:45:58 +00:00
sgml+xml * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless 2012-01-18 20:16:00 +00:00