From: George Joseph <gjoseph@digium.com>
Date: Mon, 2 Apr 2018 15:14:15 +0000 (-0500)
Subject: Merge "main: Update copyright notice with year 2018"
X-Git-Tag: 16.0.0-rc1~212
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=df7277ac5d524d08c295f3c424dd1cbe9ce75c32;p=thirdparty%2Fasterisk.git

Merge "main: Update copyright notice with year 2018"
---

df7277ac5d524d08c295f3c424dd1cbe9ce75c32
diff --cc main/asterisk.c
index 3e5785076b,6d838d0a0d..665b4be840
--- a/main/asterisk.c
+++ b/main/asterisk.c
@@@ -294,9 -294,13 +294,9 @@@ int daemon(int, int);  /* defined in li
  #define AST_MAX_CONNECTS 128
  #define NUM_MSGS 64
  
 -/*! Default minimum DTMF digit length - 80ms */
 -#define AST_MIN_DTMF_DURATION 80
 -
 -
  /*! \brief Welcome message when starting a CLI interface */
  #define WELCOME_MESSAGE \
-     ast_verbose("Asterisk %s, Copyright (C) 1999 - 2016, Digium, Inc. and others.\n" \
+     ast_verbose("Asterisk %s, Copyright (C) 1999 - 2018, Digium, Inc. and others.\n" \
                  "Created by Mark Spencer <markster@digium.com>\n" \
                  "Asterisk comes with ABSOLUTELY NO WARRANTY; type 'core show warranty' for details.\n" \
                  "This is free software, with components licensed under the GNU General Public\n" \