summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgdbadmin <gdbadmin@sourceware.org>2003-02-27 03:00:31 +0000
committergdbadmin <gdbadmin@sourceware.org>2003-02-27 03:00:31 +0000
commitb372931f062ae5fb237c4cb82821bea5033d68c1 (patch)
tree987ecd26055433097ad7ee678f189266aab8436d
parentef3ba035f4cbba5c6089743e4851ab77d97bba21 (diff)
downloadgdb-cvs/gdb_5_2-branch.tar.gz
*** empty log message ***gdb_5_2-branchcvs/gdb_5_2-branch
-rw-r--r--gdb/version.in6
1 files changed, 5 insertions, 1 deletions
diff --git a/gdb/version.in b/gdb/version.in
index 41c22b80a4b..9e485abf7a0 100644
--- a/gdb/version.in
+++ b/gdb/version.in
@@ -1 +1,5 @@
-5.2.1.0.90_2002-09-05-cvs
+<<<<<<< version.in
+5.3.0.90_2003-02-27-cvs
+=======
+5.2.1.0.90_2003-02-27-cvs
+>>>>>>> 1.262.2.193