From 5b1ba0e54600876c027f4a35362f37f8fae41219 Mon Sep 17 00:00:00 2001 From: Nathan Sidwell Date: Wed, 18 Mar 2009 08:51:11 +0000 Subject: [PATCH] * Makefile.in: Update license to GPLv3. * ada-exp.y: Update license to GPLv3. * ada-lex.l: Update license to GPLv3. * c-exp.y: Update license to GPLv3. * cp-name-parser.y: Update license to GPLv3. * darwin-nat-info.c: Update license to GPLv3. * f-exp.y: Update license to GPLv3. * gdb_thread_db.h: Update license to GPLv3. * hppanbsd-nat.c: Update license to GPLv3. * hppanbsd-tdep.c: Update license to GPLv3. * hppaobsd-tdep.c: Update license to GPLv3. * jv-exp.y: Update license to GPLv3. * m2-exp.y: Update license to GPLv3. * objc-exp.y: Update license to GPLv3. * p-exp.y: Update license to GPLv3. * reply_mig_hack.awk: Update license to GPLv3. * reverse.c: Update license to GPLv3. * xtensa-xtregs.c: Update license to GPLv3. --- gdb/ChangeLog | 22 ++++++++++++++++++++++ gdb/Makefile.in | 6 ++---- gdb/ada-exp.y | 30 ++++++++++++++---------------- gdb/ada-lex.l | 30 ++++++++++++++---------------- gdb/c-exp.y | 30 ++++++++++++++---------------- gdb/cp-name-parser.y | 30 ++++++++++++++---------------- gdb/darwin-nat-info.c | 6 ++---- gdb/f-exp.y | 30 ++++++++++++++---------------- gdb/gdb_thread_db.h | 8 +++----- gdb/hppanbsd-nat.c | 6 ++---- gdb/hppanbsd-tdep.c | 6 ++---- gdb/hppaobsd-tdep.c | 6 ++---- gdb/jv-exp.y | 30 ++++++++++++++---------------- gdb/m2-exp.y | 30 ++++++++++++++---------------- gdb/objc-exp.y | 6 ++---- gdb/p-exp.y | 30 ++++++++++++++---------------- gdb/reply_mig_hack.awk | 6 ++---- gdb/reverse.c | 6 ++---- gdb/xtensa-xtregs.c | 2 +- 19 files changed, 154 insertions(+), 166 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 7ac905a0d9e..d0d562f176c 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,24 @@ +2009-03-18 Nathan Sidwell + + * Makefile.in: Update license to GPLv3. + * ada-exp.y: Update license to GPLv3. + * ada-lex.l: Update license to GPLv3. + * c-exp.y: Update license to GPLv3. + * cp-name-parser.y: Update license to GPLv3. + * darwin-nat-info.c: Update license to GPLv3. + * f-exp.y: Update license to GPLv3. + * gdb_thread_db.h: Update license to GPLv3. + * hppanbsd-nat.c: Update license to GPLv3. + * hppanbsd-tdep.c: Update license to GPLv3. + * hppaobsd-tdep.c: Update license to GPLv3. + * jv-exp.y: Update license to GPLv3. + * m2-exp.y: Update license to GPLv3. + * objc-exp.y: Update license to GPLv3. + * p-exp.y: Update license to GPLv3. + * reply_mig_hack.awk: Update license to GPLv3. + * reverse.c: Update license to GPLv3. + * xtensa-xtregs.c: Update license to GPLv3. + 2009-03-18 Pedro Alves * remote.c (remote_close): Don't call generic_mourn_inferior. @@ -145,6 +166,7 @@ RETVAL_EXPR for UNOP_CAST and set RETURN_TYPE to the RETURN_VALUE type if RETURN_TYPE is NULL. +>>>>>>> 1.10280 2009-03-14 Pedro Alves * remote.c (PACKET_qAttached): New. diff --git a/gdb/Makefile.in b/gdb/Makefile.in index 74aa72ea11c..447906c6dab 100644 --- a/gdb/Makefile.in +++ b/gdb/Makefile.in @@ -6,7 +6,7 @@ # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, @@ -15,9 +15,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, -# Boston, MA 02110-1301, USA. +# along with this program. If not, see . prefix = @prefix@ exec_prefix = @exec_prefix@ diff --git a/gdb/ada-exp.y b/gdb/ada-exp.y index 243b1524513..0da0caac1cd 100644 --- a/gdb/ada-exp.y +++ b/gdb/ada-exp.y @@ -2,22 +2,20 @@ Copyright (C) 1986, 1989, 1990, 1991, 1993, 1994, 1997, 2000, 2003, 2004, 2007, 2008, 2009 Free Software Foundation, Inc. -This file is part of GDB. - -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 51 Franklin Street, Fifth Floor, -Boston, MA 02110-1301, USA. */ + This file is part of GDB. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . */ /* Parse an Ada expression from text in a string, and return the result as a struct expression pointer. diff --git a/gdb/ada-lex.l b/gdb/ada-lex.l index 995cd80d2ba..9886553e4b5 100644 --- a/gdb/ada-lex.l +++ b/gdb/ada-lex.l @@ -2,22 +2,20 @@ Copyright (C) 1994, 1997, 1998, 2000, 2001, 2002, 2003, 2007, 2008, 2009 Free Software Foundation, Inc. -This file is part of GDB. - -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 51 Franklin Street, Fifth Floor, -Boston, MA 02110-1301, USA. */ + This file is part of GDB. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . */ /*----------------------------------------------------------------------*/ diff --git a/gdb/c-exp.y b/gdb/c-exp.y index d4bbbccd362..04911ec3a0b 100644 --- a/gdb/c-exp.y +++ b/gdb/c-exp.y @@ -3,22 +3,20 @@ 1998, 1999, 2000, 2003, 2004, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. -This file is part of GDB. - -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 51 Franklin Street, Fifth Floor, -Boston, MA 02110-1301, USA. */ + This file is part of GDB. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . */ /* Parse a C expression from text in a string, and return the result as a struct expression pointer. diff --git a/gdb/cp-name-parser.y b/gdb/cp-name-parser.y index 5f5ee3ac1d9..0b5069d0217 100644 --- a/gdb/cp-name-parser.y +++ b/gdb/cp-name-parser.y @@ -5,22 +5,20 @@ Parts of the lexer are based on c-exp.y from GDB. -This file is part of GDB. - -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 51 Franklin Street, Fifth Floor, -Boston, MA 02110-1301, USA. */ + This file is part of GDB. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . */ /* Note that malloc's and realloc's in this file are transformed to xmalloc and xrealloc respectively by the same sed command in the diff --git a/gdb/darwin-nat-info.c b/gdb/darwin-nat-info.c index 38339929043..93a1779386b 100644 --- a/gdb/darwin-nat-info.c +++ b/gdb/darwin-nat-info.c @@ -8,7 +8,7 @@ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or + the Free Software Foundation; either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -17,9 +17,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. */ + along with this program. If not, see . */ /* The name of the ppc_thread_state structure, and the names of its members, have been changed for Unix conformance reasons. The easiest diff --git a/gdb/f-exp.y b/gdb/f-exp.y index d91c413bed6..c04c8f46410 100644 --- a/gdb/f-exp.y +++ b/gdb/f-exp.y @@ -6,22 +6,20 @@ Contributed by Motorola. Adapted from the C parser by Farooq Butt (fmbutt@engage.sps.mot.com). -This file is part of GDB. - -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 51 Franklin Street, Fifth Floor, -Boston, MA 02110-1301, USA. */ + This file is part of GDB. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . */ /* This was blantantly ripped off the C expression parser, please be aware of that as you look at its basic structure -FMB */ diff --git a/gdb/gdb_thread_db.h b/gdb/gdb_thread_db.h index 67dc9ffa7b3..a5f2477210d 100644 --- a/gdb/gdb_thread_db.h +++ b/gdb/gdb_thread_db.h @@ -7,7 +7,7 @@ The GNU C Library is free software; you can redistribute it and/or modify it under the terms of the GNU Library General Public License as - published by the Free Software Foundation; either version 2 of the + published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version. The GNU C Library is distributed in the hope that it will be useful, @@ -15,10 +15,8 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Library General Public License for more details. - You should have received a copy of the GNU Library General Public - License along with the GNU C Library; see the file COPYING.LIB. If not, - write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. */ + You should have received a copy of the GNU General Public License + along with this program. If not, see . */ #ifndef _THREAD_DB_H #define _THREAD_DB_H 1 diff --git a/gdb/hppanbsd-nat.c b/gdb/hppanbsd-nat.c index 631c2bec851..405be2890aa 100644 --- a/gdb/hppanbsd-nat.c +++ b/gdb/hppanbsd-nat.c @@ -6,7 +6,7 @@ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or + the Free Software Foundation; either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -15,9 +15,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. */ + along with this program. If not, see . */ #include "defs.h" #include "inferior.h" diff --git a/gdb/hppanbsd-tdep.c b/gdb/hppanbsd-tdep.c index 528fa540b6c..d695df79cac 100644 --- a/gdb/hppanbsd-tdep.c +++ b/gdb/hppanbsd-tdep.c @@ -6,7 +6,7 @@ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or + the Free Software Foundation; either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -15,9 +15,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. */ + along with this program. If not, see . */ #include "defs.h" #include "osabi.h" diff --git a/gdb/hppaobsd-tdep.c b/gdb/hppaobsd-tdep.c index 69655e2650c..8ad6f8ed3a9 100644 --- a/gdb/hppaobsd-tdep.c +++ b/gdb/hppaobsd-tdep.c @@ -6,7 +6,7 @@ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or + the Free Software Foundation; either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -15,9 +15,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. */ + along with this program. If not, see . */ #include "defs.h" #include "osabi.h" diff --git a/gdb/jv-exp.y b/gdb/jv-exp.y index 6cc2a5fee50..89ec3e94607 100644 --- a/gdb/jv-exp.y +++ b/gdb/jv-exp.y @@ -2,22 +2,20 @@ Copyright (C) 1997, 1998, 1999, 2000, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. -This file is part of GDB. - -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 51 Franklin Street, Fifth Floor, -Boston, MA 02110-1301, USA. */ + This file is part of GDB. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . */ /* Parse a Java expression from text in a string, and return the result as a struct expression pointer. diff --git a/gdb/m2-exp.y b/gdb/m2-exp.y index 2e29c77eccb..41271b77ba8 100644 --- a/gdb/m2-exp.y +++ b/gdb/m2-exp.y @@ -4,22 +4,20 @@ Generated from expread.y (now c-exp.y) and contributed by the Department of Computer Science at the State University of New York at Buffalo, 1991. -This file is part of GDB. - -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 51 Franklin Street, Fifth Floor, -Boston, MA 02110-1301, USA. */ + This file is part of GDB. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . */ /* Parse a Modula-2 expression from text in a string, and return the result as a struct expression pointer. diff --git a/gdb/objc-exp.y b/gdb/objc-exp.y index 09541e78552..746b7457f8d 100644 --- a/gdb/objc-exp.y +++ b/gdb/objc-exp.y @@ -5,7 +5,7 @@ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or + the Free Software Foundation; either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -14,9 +14,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. */ + along with this program. If not, see . */ /* Parse a C expression from text in a string, and return the result as a struct expression pointer. That structure contains arithmetic diff --git a/gdb/p-exp.y b/gdb/p-exp.y index 7dfdad78916..dff9b97b99d 100644 --- a/gdb/p-exp.y +++ b/gdb/p-exp.y @@ -1,22 +1,20 @@ /* YACC parser for Pascal expressions, for GDB. Copyright (C) 2000, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. -This file is part of GDB. - -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 51 Franklin Street, Fifth Floor, -Boston, MA 02110-1301, USA. */ + This file is part of GDB. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . */ /* This file is derived from c-exp.y */ diff --git a/gdb/reply_mig_hack.awk b/gdb/reply_mig_hack.awk index a16ad23160b..c434b30fe73 100644 --- a/gdb/reply_mig_hack.awk +++ b/gdb/reply_mig_hack.awk @@ -7,7 +7,7 @@ # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2, or (at +# published by the Free Software Foundation; either version 3, or (at # your option) any later version. # # This program is distributed in the hope that it will be useful, but @@ -16,9 +16,7 @@ # General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, -# Boston, MA 02110-1301, USA. +# along with this program. If not, see . # # This awk script hacks the output of mig-generated reply server code # so that it allows replies with just the error-code in them (as this is diff --git a/gdb/reverse.c b/gdb/reverse.c index bbd3a609184..ee59cf3673a 100644 --- a/gdb/reverse.c +++ b/gdb/reverse.c @@ -6,7 +6,7 @@ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or + the Free Software Foundation; either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, @@ -15,9 +15,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. */ + along with this program. If not, see . */ #include "defs.h" #include "gdb_string.h" diff --git a/gdb/xtensa-xtregs.c b/gdb/xtensa-xtregs.c index f090e707180..c10e8638c39 100644 --- a/gdb/xtensa-xtregs.c +++ b/gdb/xtensa-xtregs.c @@ -5,7 +5,7 @@ This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as - published by the Free Software Foundation; either version 2 of the + published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, -- 2.30.2