2009-08-14 Benjamin Kosnik <bkoz@redhat.com>

[pf3gnuchains/gcc-fork.git] / libstdc++-v3 / ChangeLog

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 6472414..27757d0 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,7 +1,15 @@
+<<<<<<< .mine
+2009-08-14  Benjamin Kosnik  <bkoz@redhat.com>
+
+       * include/ext/pointer.h: Add pragma system_header, use
+       _GLIBCXX_USE_LONG_LONG, macro cleanup.
+
+=======
 2009-08-14  Uros Bizjak  <ubizjak@gmail.com>
 
        * src/compatibility-ldbl.cc: Include cmath.
 
+>>>>>>> .r150760
 2009-08-13  Benjamin Kosnik  <bkoz@redhat.com>
 
        * src/compatibility-ldbl.cc: Include tr1/functional.