Changelog: Fix merge bit.

2008-04-10  Benjamin Kosnik  <bkoz@redhat.com>

	* Changelog: Fix merge bit.

From-SVN: r134175
This commit is contained in:
Benjamin Kosnik 2008-04-10 20:28:38 +00:00
parent d466a7e21c
commit 00bf373b67
1 changed files with 0 additions and 1 deletions

View File

@ -253,7 +253,6 @@
* doc/xml/manual/parallel_mode.xml: Correct configuration documentation.
* doc/html/manual/bk01pt12ch31s04.html: Regenerate.
>>>>>>> .r133664
2008-03-18 Benjamin Kosnik <bkoz@redhat.com>
* configure.ac (libtool_VERSION): To 6:11:0.