aboutsummaryrefslogtreecommitdiff
path: root/gdb/version.in
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
commita11edd660855ebdd9be134242fceed47b039bc49 (patch)
tree41ef8998bf9f63ce99c9acd53040b1f5d52cef97 /gdb/version.in
parent8a0f436dea44bcc413a1e7b5654f19b7b6e0ca3d (diff)
downloadgdb-gdb_5_2-branch.zip
gdb-gdb_5_2-branch.tar.gz
gdb-gdb_5_2-branch.tar.bz2
*** empty log message ***gdb_5_2-branch
Diffstat (limited to 'gdb/version.in')
-rw-r--r--gdb/version.in6
1 files changed, 5 insertions, 1 deletions
diff --git a/gdb/version.in b/gdb/version.in
index 41c22b8..9e485ab 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