merge with trunk

build/build.no.stable

@@ -1 +1 @@
-0 96 1
+0 96 2

build/m_version.h.in

@@ -2,7 +2,7 @@
 
 Miranda NG: the free IM client for Microsoft* Windows*
 
-Copyright (c) 2012-22 Miranda NG team (https://miranda-ng.org)
+Copyright (c) 2012-23 Miranda NG team (https://miranda-ng.org)
 Copyright (c) 2000-08 Miranda ICQ/IM project,
 all portions of this codebase are copyrighted to the people 
 listed in contributors.txt.

docs/readme.txt

@@ -91,7 +91,7 @@ Miranda NG is released under the terms of the GNU General Public License. See
 "LICENSE" for more details.
 
 Miranda IM is copyright 2000-2012 by the people listed in contributors.txt.
-Miranda NG is copyright 2012-2022 by the people listed in contributors.txt.
+Miranda NG is copyright 2012-2023 by the people listed in contributors.txt.
 
 The plugins included with this release are copyrighted by their authors. See the
 documentation for each plugin for more information.

include/chat_resource.h

@@ -1,36 +1,36 @@
-/*
-
-Miranda NG: the free IM client for Microsoft* Windows*
-
-Copyright (C) 2012-22 Miranda NG team (https://miranda-ng.org)
-Copyright (c) 2000-08 Miranda ICQ/IM project,
-all portions of this codebase are copyrighted to the people
-listed in contributors.txt.
-
-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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-*/
-
-#define IDC_SRMM_COLOR        3001
-#define IDC_SRMM_BKGCOLOR     3002
-#define IDC_SRMM_BOLD         3003
-#define IDC_SRMM_ITALICS      3004
-#define IDC_SRMM_UNDERLINE    3005
-#define IDC_SRMM_FILTER       3006
-#define IDC_SRMM_CHANMGR      3007
-#define IDC_SRMM_SHOWNICKLIST 3008
-#define IDC_SRMM_HISTORY      3009
-#define IDC_SRMM_NICKLIST     3010
-#define IDC_SRMM_LOG          3011
-#define IDC_SRMM_MESSAGE      3012
+/*
+
+Miranda NG: the free IM client for Microsoft* Windows*
+
+Copyright (C) 2012-23 Miranda NG team (https://miranda-ng.org)
+Copyright (c) 2000-08 Miranda ICQ/IM project,
+all portions of this codebase are copyrighted to the people
+listed in contributors.txt.
+
+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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+*/
+
+#define IDC_SRMM_COLOR        3001
+#define IDC_SRMM_BKGCOLOR     3002
+#define IDC_SRMM_BOLD         3003
+#define IDC_SRMM_ITALICS      3004
+#define IDC_SRMM_UNDERLINE    3005
+#define IDC_SRMM_FILTER       3006
+#define IDC_SRMM_CHANMGR      3007
+#define IDC_SRMM_SHOWNICKLIST 3008
+#define IDC_SRMM_HISTORY      3009
+#define IDC_SRMM_NICKLIST     3010
+#define IDC_SRMM_LOG          3011
+#define IDC_SRMM_MESSAGE      3012

include/delphi/m_crypto.inc

@@ -1,7 +1,7 @@
 {
 Miranda NG: the free IM client for Microsoft* Windows*
 
-Copyright (C) 2012-22 Miranda NG team (https://miranda-ng.org)
+Copyright (C) 2012-23 Miranda NG team (https://miranda-ng.org)
 all portions of this codebase are copyrighted to the people
 listed in contributors.txt.
 

include/m_avatars.h

@@ -2,7 +2,7 @@
 
 Miranda NG: the free IM client for Microsoft* Windows*
 
-Copyright (C) 2012-22 Miranda NG team (https://miranda-ng.org)
+Copyright (C) 2012-23 Miranda NG team (https://miranda-ng.org)
 Copyright (c) 2000-12 Miranda ICQ/IM project,
 all portions of this codebase are copyrighted to the people
 listed in contributors.txt.

include/m_awaymsg.h

@@ -2,7 +2,7 @@
 
 Miranda NG: the free IM client for Microsoft* Windows*
 
-Copyright (C) 2012-22 Miranda NG team (https://miranda-ng.org)
+Copyright (C) 2012-23 Miranda NG team (https://miranda-ng.org)
 Copyright (c) 2000-08 Miranda ICQ/IM project,
 all portions of this codebase are copyrighted to the people
 listed in contributors.txt.

include/m_button.h

@@ -2,7 +2,7 @@
 
 Miranda NG: the free IM client for Microsoft* Windows*
 
-Copyright (C) 2012-22 Miranda NG team (https://miranda-ng.org)
+Copyright (C) 2012-23 Miranda NG team (https://miranda-ng.org)
 Copyright (c) 2000-08 Miranda ICQ/IM project,
 all portions of this codebase are copyrighted to the people
 listed in contributors.txt.

include/m_button_int.h

@@ -2,7 +2,7 @@
 
 Miranda NG: the free IM client for Microsoft* Windows*
 
-Copyright (C) 2012-22 Miranda NG team (https://miranda-ng.org)
+Copyright (C) 2012-23 Miranda NG team (https://miranda-ng.org)
 Copyright (c) 2000-08 Miranda ICQ/IM project,
 all portions of this codebase are copyrighted to the people
 listed in contributors.txt.

include/m_chat_int.h

@@ -2,7 +2,7 @@
 
 Chat module interface for Miranda NG
 
-Copyright (c) 2014-22 George Hazan
+Copyright (c) 2014-23 George Hazan
 
 This program is free software; you can redistribute it and/or
 modify it under the terms of the GNU General Public License