fix remaining breakage related to chan_modem modules

git-svn-id: http://svn.digium.com/svn/asterisk/branches/v1-2@7127 f38db490-d61c-443f-a65b-d21fe96a405b

1 files changed, 6 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 4e1073e5c..37caadb19 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2005-11-16  Kevin P. Fleming  <kpfleming@digium.com>
+
+	* Asterisk 1.2.0 released.
+	
 2005-11-16  Jeremy McNamara <jj@nufone.net>
 
 	* apps/app_voicemail.c (load_config): do not terminate asterisk if no voicemail config file
@@ -10,7 +14,8 @@
 2005-11-16  Kevin P. Fleming  <kpfleming@digium.com>
 
 	* channels/Makefile: don't build chan_modem and sub-modules by default
-
+	* configs/modules.conf.sample: explicitly 'noload' chan_modem.so and submodules, in case old versions exist
+	
 	* res/Makefile: issue mpg123 not-installed warning at 'make install' time, not 'make'
 
 	* apps/app_forkcdr.c (forkcdr_exec): issue warning (and don't segfault) if ForkCDR is called on a channel that doesn't have a CDR (issue #5763)