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
..
docutils	big breaking change: renaming lib.getAttr to lib.attrByPath	2009-05-24 10:57:41 +00:00
doxygen	Doxygen: Reinstate version 1.7.	2012-02-28 10:08:21 +00:00
gnome-doc-utils	svn merge ^/nixpkgs/trunk	2012-03-31 20:01:40 +00:00
gtk-doc	Move gnome-doc-utils and gtk-doc to top-level	2012-03-19 04:36:41 +00:00
haddock	Removed myself as a maintainer from Haskell packages that I don't personally use.	2012-03-24 10:21:28 +00:00
xdoc	* Reverted r6713, r6711, r4623, r3660, r2237. There rewrote fetchurl	2007-08-24 12:32:36 +00:00