projects / gcc.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: d466a7e)
Changelog: Fix merge bit.
authorBenjamin Kosnik <bkoz@gcc.gnu.org>
Thu, 10 Apr 2008 20:28:38 +0000 (20:28 +0000)
committerBenjamin Kosnik <bkoz@gcc.gnu.org>
Thu, 10 Apr 2008 20:28:38 +0000 (20:28 +0000)
2008-04-10  Benjamin Kosnik  <bkoz@redhat.com>

* Changelog: Fix merge bit.

From-SVN: r134175

libstdc++-v3/ChangeLog patch | blob | history

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 3877bc30ac1289d765a484f0ee6964808a704397..838bf2e03f05c281c345a45fee6a5c59e65e96b7 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -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.