5299c1f6fb
- 1 conflict (gnome-doc-utils) - final merge before --reintegrate svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33500 |
||
---|---|---|
.. | ||
docutils | ||
doxygen | ||
gnome-doc-utils | ||
gtk-doc | ||
haddock | ||
xdoc |
5299c1f6fb
- 1 conflict (gnome-doc-utils) - final merge before --reintegrate svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33500 |
||
---|---|---|
.. | ||
docutils | ||
doxygen | ||
gnome-doc-utils | ||
gtk-doc | ||
haddock | ||
xdoc |