diff options
-rw-r--r-- | gcc/ada/gnatvsn.ads | 6 | ||||
-rw-r--r-- | libstdc++-v3/include/bits/c++config | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/gcc/ada/gnatvsn.ads b/gcc/ada/gnatvsn.ads index 56f64a6d9cb..c5b3a00ccbd 100644 --- a/gcc/ada/gnatvsn.ads +++ b/gcc/ada/gnatvsn.ads @@ -6,7 +6,7 @@ -- -- -- S p e c -- -- -- --- $Revision: 1.2.12.2.2.305 $ +-- $Revision: 1.2.12.2.2.306 $ -- -- -- Copyright (C) 1992-2002 Free Software Foundation, Inc. -- -- -- @@ -39,9 +39,9 @@ package Gnatvsn is <<<<<<< gnatvsn.ads - Gnat_Version_String : constant String := "3.1.1 20030417 (prerelease)"; + Gnat_Version_String : constant String := "3.1.1 20030418 (prerelease)"; ======= - Gnat_Version_String : constant String := "3.2 20030417 (prerelease)"; + Gnat_Version_String : constant String := "3.2 20030418 (prerelease)"; >>>>>>> 1.2.12.66 -- Version output when GNAT (compiler), or its related tools, including -- GNATBIND, GNATCHOP, GNATFIND, GNATLINK, GNATMAKE, GNATXREF, are run diff --git a/libstdc++-v3/include/bits/c++config b/libstdc++-v3/include/bits/c++config index 958ae84e8f6..6390f94e617 100644 --- a/libstdc++-v3/include/bits/c++config +++ b/libstdc++-v3/include/bits/c++config @@ -34,7 +34,7 @@ #include <bits/os_defines.h> // The current version of the C++ library in compressed ISO date format. -#define __GLIBCPP__ 20030417 +#define __GLIBCPP__ 20030418 // This is necessary until GCC supports separate template // compilation. |