diff options
| author | Benjamin Kosnik <bkoz@gcc.gnu.org> | 2008-04-10 20:28:38 +0000 |
|---|---|---|
| committer | Benjamin Kosnik <bkoz@gcc.gnu.org> | 2008-04-10 20:28:38 +0000 |
| commit | 00bf373b67991459464d24c5bc7d7dafc157a364 (patch) | |
| tree | 37282f1a4abfc4197df28feaa462aa756422948c | |
| parent | d466a7e21c61360550e04a66dcd2cacd5172d672 (diff) | |
| download | gcc-00bf373b67991459464d24c5bc7d7dafc157a364.zip gcc-00bf373b67991459464d24c5bc7d7dafc157a364.tar.gz gcc-00bf373b67991459464d24c5bc7d7dafc157a364.tar.bz2 | |
Changelog: Fix merge bit.
2008-04-10 Benjamin Kosnik <bkoz@redhat.com>
* Changelog: Fix merge bit.
From-SVN: r134175
| -rw-r--r-- | libstdc++-v3/ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 3877bc3..838bf2e 100644 --- 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. |