Files asterisk/.cvsignore and asterisk1/.cvsignore are identical
Only in asterisk1: .version
Files asterisk/BUGS and asterisk1/BUGS are identical
Files asterisk/CREDITS and asterisk1/CREDITS are identical
diff -r -C3 -rcs asterisk/CVS/Entries asterisk1/CVS/Entries
*** asterisk/CVS/Entries	Fri Oct  3 13:43:29 2003
--- asterisk1/CVS/Entries	Thu Oct  2 18:51:00 2003
***************
*** 4,10 ****
  /ChangeLog/1.29/Wed Oct  1 15:03:30 2003//
  /HARDWARE/1.1.1.1/Wed Feb 12 13:59:13 2003//
  /LICENSE/1.1.1.1/Wed Feb 12 13:59:13 2003//
- /Makefile/1.33/Sat Sep 27 15:52:17 2003//
  /README/1.1.1.1/Wed Feb 12 13:59:13 2003//
  /README.cdr/1.1.1.1/Wed Feb 12 13:59:13 2003//
  /README.festival/1.1.1.1/Wed Feb 12 13:59:13 2003//
--- 4,9 ----
***************
*** 90,92 ****
--- 89,92 ----
  D/res////
  D/sounds////
  D/stdtime////
+ /Makefile/1.33/Thu Oct  2 22:51:00 2003//
Only in asterisk1/CVS: Entries.Log
Files asterisk/CVS/Repository and asterisk1/CVS/Repository are identical
Files asterisk/CVS/Root and asterisk1/CVS/Root are identical
Files asterisk/ChangeLog and asterisk1/ChangeLog are identical
Files asterisk/HARDWARE and asterisk1/HARDWARE are identical
Files asterisk/LICENSE and asterisk1/LICENSE are identical
diff -r -C3 -rcs asterisk/Makefile asterisk1/Makefile
*** asterisk/Makefile	Sat Sep 27 11:52:17 2003
--- asterisk1/Makefile	Fri Oct  3 08:49:26 2003
***************
*** 18,24 ****
  
  OSARCH=$(shell uname -s)
  
! ifeq (${OSARCH},Linux)
  PROC=$(shell uname -m)
  endif
  # Pentium Pro Optimize
--- 18,24 ----
  
  OSARCH=$(shell uname -s)
  
! ifeq (${OSARCH},FreeBSD)
  PROC=$(shell uname -m)
  endif
  # Pentium Pro Optimize
***************
*** 78,108 ****
  # Don't use together with -DBUSYDETECT_TONEONLY
  BUSYDETECT+= #-DBUSYDETECT_COMPARE_TONE_AND_SILENCE
  
! ASTLIBDIR=$(INSTALL_PREFIX)/usr/lib/asterisk
  ASTVARLIBDIR=$(INSTALL_PREFIX)/var/lib/asterisk
! ASTETCDIR=$(INSTALL_PREFIX)/etc/asterisk
  ASTSPOOLDIR=$(INSTALL_PREFIX)/var/spool/asterisk
  ASTLOGDIR=$(INSTALL_PREFIX)/var/log/asterisk
  ASTHEADERDIR=$(INSTALL_PREFIX)/usr/include/asterisk
  ASTCONFPATH=$(ASTETCDIR)/asterisk.conf
! ASTBINDIR=$(INSTALL_PREFIX)/usr/bin
! ASTSBINDIR=$(INSTALL_PREFIX)/usr/sbin
  ASTVARRUNDIR=$(INSTALL_PREFIX)/var/run
  
  
  MODULES_DIR=$(ASTLIBDIR)/modules
  AGI_DIR=$(ASTVARLIBDIR)/agi-bin
  
! INCLUDE=-Iinclude -I../include
  CFLAGS=-pipe  -Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG) $(INCLUDE) -D_REENTRANT -D_GNU_SOURCE #-DMAKE_VALGRIND_HAPPY
  CFLAGS+=$(OPTIMIZE)
  CFLAGS+=$(shell if $(CC) -march=$(PROC) -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-march=$(PROC)"; fi)
  CFLAGS+=$(shell if uname -m | grep -q ppc; then echo "-fsigned-char"; fi)
! ifeq (${OSARCH},OpenBSD)
  CFLAGS+=-pthread
  endif
  
! CFLAGS+=$(shell if [ -f /usr/include/linux/zaptel.h ]; then echo "-DZAPTEL_OPTIMIZATIONS"; fi)
  
  LIBEDIT=editline/libedit.a
  
--- 78,109 ----
  # Don't use together with -DBUSYDETECT_TONEONLY
  BUSYDETECT+= #-DBUSYDETECT_COMPARE_TONE_AND_SILENCE
  
! ASTLIBDIR=$(INSTALL_PREFIX)/usr/local/lib/asterisk
  ASTVARLIBDIR=$(INSTALL_PREFIX)/var/lib/asterisk
! ASTETCDIR=$(INSTALL_PREFIX)/usr/local/etc/asterisk
  ASTSPOOLDIR=$(INSTALL_PREFIX)/var/spool/asterisk
  ASTLOGDIR=$(INSTALL_PREFIX)/var/log/asterisk
  ASTHEADERDIR=$(INSTALL_PREFIX)/usr/include/asterisk
  ASTCONFPATH=$(ASTETCDIR)/asterisk.conf
! ASTBINDIR=$(INSTALL_PREFIX)/usr/local/bin
! ASTSBINDIR=$(INSTALL_PREFIX)/usr/local/sbin
  ASTVARRUNDIR=$(INSTALL_PREFIX)/var/run
  
  
  MODULES_DIR=$(ASTLIBDIR)/modules
  AGI_DIR=$(ASTVARLIBDIR)/agi-bin
  
! INCLUDE=-Iinclude -I../include -I/usr/include -I/usr/local/include -I/usr/local/include/glib-2.0 -I/usr/local/include/atk-1.0
! INCLUDE+=-I/usr/X11R6/include -I/usr/X11R6/include/gtk-2.0 -I/usr/X11R6/include/pango-1.0
  CFLAGS=-pipe  -Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG) $(INCLUDE) -D_REENTRANT -D_GNU_SOURCE #-DMAKE_VALGRIND_HAPPY
  CFLAGS+=$(OPTIMIZE)
  CFLAGS+=$(shell if $(CC) -march=$(PROC) -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-march=$(PROC)"; fi)
  CFLAGS+=$(shell if uname -m | grep -q ppc; then echo "-fsigned-char"; fi)
! ifeq (${OSARCH},FreeBSDBSD)
  CFLAGS+=-pthread
  endif
  
! CFLAGS+=$(shell if [ -f /usr/local/include/zaptel.h ]; then echo "-DZAPTEL_OPTIMIZATIONS"; fi)
  
  LIBEDIT=editline/libedit.a
  
***************
*** 131,137 ****
  ifeq (${OSARCH},Linux)
  LIBS=-ldl
  endif
! LIBS+=-lpthread -lncurses -lm -lresolv  #-lnjamd
  OBJS=io.o sched.o logger.o frame.o loader.o config.o channel.o \
  	translate.o file.o say.o pbx.o cli.o md5.o term.o \
  	ulaw.o alaw.o callerid.o fskmodem.o image.o app.o \
--- 132,138 ----
  ifeq (${OSARCH},Linux)
  LIBS=-ldl
  endif
! LIBS+=-pthread -lncurses -lm #-lresolv  #-lnjamd
  OBJS=io.o sched.o logger.o frame.o loader.o config.o channel.o \
  	translate.o file.o say.o pbx.o cli.o md5.o term.o \
  	ulaw.o alaw.o callerid.o fskmodem.o image.o app.o \
Only in asterisk1: Makefile.orig
Only in asterisk1: Makefile.rej
Only in asterisk1: Makefile.rej.orig
Files asterisk/README and asterisk1/README are identical
Files asterisk/README.cdr and asterisk1/README.cdr are identical
Files asterisk/README.festival and asterisk1/README.festival are identical
Files asterisk/README.iax and asterisk1/README.iax are identical
Files asterisk/README.mysql and asterisk1/README.mysql are identical
Files asterisk/README.variables and asterisk1/README.variables are identical
Files asterisk/SECURITY and asterisk1/SECURITY are identical
Files asterisk/acl.c and asterisk1/acl.c are identical
Files asterisk/addmailbox and asterisk1/addmailbox are identical
Files asterisk/agi/.cvsignore and asterisk1/agi/.cvsignore are identical
Files asterisk/agi/CVS/Entries and asterisk1/agi/CVS/Entries are identical
Files asterisk/agi/CVS/Repository and asterisk1/agi/CVS/Repository are identical
Files asterisk/agi/CVS/Root and asterisk1/agi/CVS/Root are identical
Files asterisk/agi/DialAnMp3.agi and asterisk1/agi/DialAnMp3.agi are identical
Files asterisk/agi/Makefile and asterisk1/agi/Makefile are identical
Files asterisk/agi/agi-test.agi and asterisk1/agi/agi-test.agi are identical
Only in asterisk1/agi: eagi-sphinx-test
Files asterisk/agi/eagi-sphinx-test.c and asterisk1/agi/eagi-sphinx-test.c are identical
Only in asterisk1/agi: eagi-test
Files asterisk/agi/eagi-test.c and asterisk1/agi/eagi-test.c are identical
Files asterisk/agi/numeralize and asterisk1/agi/numeralize are identical
Files asterisk/alaw.c and asterisk1/alaw.c are identical
Files asterisk/app.c and asterisk1/app.c are identical
Files asterisk/apps/.cvsignore and asterisk1/apps/.cvsignore are identical
Files asterisk/apps/CVS/Entries and asterisk1/apps/CVS/Entries are identical
Files asterisk/apps/CVS/Repository and asterisk1/apps/CVS/Repository are identical
Files asterisk/apps/CVS/Root and asterisk1/apps/CVS/Root are identical
diff -r -C3 -rcs asterisk/apps/Makefile asterisk1/apps/Makefile
*** asterisk/apps/Makefile	Tue Sep 30 19:03:57 2003
--- asterisk1/apps/Makefile	Fri Oct  3 12:25:22 2003
***************
*** 15,21 ****
  
  
  #APPS=app_dial.so app_playback.so app_directory.so app_intercom.so app_mp3.so 
! APPS=app_dial.so app_playback.so app_voicemail.so app_directory.so app_intercom.so app_mp3.so \
       app_system.so app_echo.so app_record.so app_image.so app_url.so app_disa.so \
       app_agi.so app_qcall.so app_adsiprog.so app_getcpeid.so app_milliwatt.so \
       app_zapateller.so app_datetime.so app_setcallerid.so app_festival.so \
--- 15,21 ----
  
  
  #APPS=app_dial.so app_playback.so app_directory.so app_intercom.so app_mp3.so 
! APPS=app_dial.so app_playback.so app_voicemail.so app_directory.so app_mp3.so \
       app_system.so app_echo.so app_record.so app_image.so app_url.so app_disa.so \
       app_agi.so app_qcall.so app_adsiprog.so app_getcpeid.so app_milliwatt.so \
       app_zapateller.so app_datetime.so app_setcallerid.so app_festival.so \
***************
*** 26,36 ****
       app_enumlookup.so app_voicemail2.so app_transfer.so app_setcidnum.so app_cdr.so \
       app_hasnewvoicemail.so app_sayunixtime.so
  
  #APPS+=app_sql_postgres.so
  #APPS+=app_sql_odbc.so
  
! APPS+=$(shell if [ -f /usr/include/linux/zaptel.h ]; then echo "app_zapras.so app_meetme.so app_flash.so app_zapbarge.so" ; fi)
! #APPS+=$(shell if [ -f /usr/include/zap.h ]; then echo "app_rpt.so" ; fi)
  
  CFLAGS+=-fPIC
  
--- 26,39 ----
       app_enumlookup.so app_voicemail2.so app_transfer.so app_setcidnum.so app_cdr.so \
       app_hasnewvoicemail.so app_sayunixtime.so
  
+ ifneq ($(OSARCH),FreeBSD)
+ APPS+=app_intercom.so
+ endif
  #APPS+=app_sql_postgres.so
  #APPS+=app_sql_odbc.so
  
! #APPS+=$(shell if [ -f /usr/include/linux/zaptel.h ]; then echo "app_zapras.so app_meetme.so app_flash.so app_zapbarge.so" ; fi)
! APPS+=$(shell if [ -f /usr/include/zap.h ]; then echo "app_rpt.so" ; fi)
  
  CFLAGS+=-fPIC
  
Only in asterisk1/apps: Makefile.orig
Files asterisk/apps/app_adsiprog.c and asterisk1/apps/app_adsiprog.c are identical
Files asterisk/apps/app_agi.c and asterisk1/apps/app_agi.c are identical
Files asterisk/apps/app_authenticate.c and asterisk1/apps/app_authenticate.c are identical
Files asterisk/apps/app_cdr.c and asterisk1/apps/app_cdr.c are identical
Files asterisk/apps/app_chanisavail.c and asterisk1/apps/app_chanisavail.c are identical
Files asterisk/apps/app_datetime.c and asterisk1/apps/app_datetime.c are identical
Files asterisk/apps/app_db.c and asterisk1/apps/app_db.c are identical
Files asterisk/apps/app_dial.c and asterisk1/apps/app_dial.c are identical
Files asterisk/apps/app_directory.c and asterisk1/apps/app_directory.c are identical
Files asterisk/apps/app_disa.c and asterisk1/apps/app_disa.c are identical
Files asterisk/apps/app_echo.c and asterisk1/apps/app_echo.c are identical
Files asterisk/apps/app_enumlookup.c and asterisk1/apps/app_enumlookup.c are identical
Files asterisk/apps/app_festival.c and asterisk1/apps/app_festival.c are identical
Files asterisk/apps/app_flash.c and asterisk1/apps/app_flash.c are identical
Files asterisk/apps/app_getcpeid.c and asterisk1/apps/app_getcpeid.c are identical
Files asterisk/apps/app_hasnewvoicemail.c and asterisk1/apps/app_hasnewvoicemail.c are identical
Files asterisk/apps/app_image.c and asterisk1/apps/app_image.c are identical
diff -r -C3 -rcs asterisk/apps/app_intercom.c asterisk1/apps/app_intercom.c
*** asterisk/apps/app_intercom.c	Wed Aug 13 11:25:16 2003
--- asterisk1/apps/app_intercom.c	Thu Oct  2 20:39:08 2003
***************
*** 29,35 ****
  #ifdef __linux__
  #include <linux/soundcard.h>
  #else
! #include <soundcard.h>
  #endif
  #include <netinet/in.h>
  
--- 29,35 ----
  #ifdef __linux__
  #include <linux/soundcard.h>
  #else
! #include <sys/soundcard.h>
  #endif
  #include <netinet/in.h>
  
Files asterisk/apps/app_lookupblacklist.c and asterisk1/apps/app_lookupblacklist.c are identical
Files asterisk/apps/app_lookupcidname.c and asterisk1/apps/app_lookupcidname.c are identical
Files asterisk/apps/app_macro.c and asterisk1/apps/app_macro.c are identical
Files asterisk/apps/app_meetme.c and asterisk1/apps/app_meetme.c are identical
Files asterisk/apps/app_milliwatt.c and asterisk1/apps/app_milliwatt.c are identical
Files asterisk/apps/app_mp3.c and asterisk1/apps/app_mp3.c are identical
Only in asterisk1/apps: app_mp3.c.rej
Files asterisk/apps/app_parkandannounce.c and asterisk1/apps/app_parkandannounce.c are identical
Files asterisk/apps/app_playback.c and asterisk1/apps/app_playback.c are identical
Files asterisk/apps/app_privacy.c and asterisk1/apps/app_privacy.c are identical
Files asterisk/apps/app_qcall.c and asterisk1/apps/app_qcall.c are identical
Files asterisk/apps/app_queue.c and asterisk1/apps/app_queue.c are identical
Files asterisk/apps/app_record.c and asterisk1/apps/app_record.c are identical
Files asterisk/apps/app_rpt.c and asterisk1/apps/app_rpt.c are identical
Files asterisk/apps/app_sayunixtime.c and asterisk1/apps/app_sayunixtime.c are identical
Files asterisk/apps/app_senddtmf.c and asterisk1/apps/app_senddtmf.c are identical
Files asterisk/apps/app_setcallerid.c and asterisk1/apps/app_setcallerid.c are identical
Files asterisk/apps/app_setcidname.c and asterisk1/apps/app_setcidname.c are identical
Files asterisk/apps/app_setcidnum.c and asterisk1/apps/app_setcidnum.c are identical
Files asterisk/apps/app_skel.c and asterisk1/apps/app_skel.c are identical
Files asterisk/apps/app_softhangup.c and asterisk1/apps/app_softhangup.c are identical
Files asterisk/apps/app_sql_postgres.c and asterisk1/apps/app_sql_postgres.c are identical
Files asterisk/apps/app_striplsd.c and asterisk1/apps/app_striplsd.c are identical
Files asterisk/apps/app_substring.c and asterisk1/apps/app_substring.c are identical
Files asterisk/apps/app_system.c and asterisk1/apps/app_system.c are identical
Files asterisk/apps/app_transfer.c and asterisk1/apps/app_transfer.c are identical
Files asterisk/apps/app_url.c and asterisk1/apps/app_url.c are identical
Files asterisk/apps/app_voicemail.c and asterisk1/apps/app_voicemail.c are identical
Files asterisk/apps/app_voicemail2.c and asterisk1/apps/app_voicemail2.c are identical
Files asterisk/apps/app_waitforring.c and asterisk1/apps/app_waitforring.c are identical
Files asterisk/apps/app_zapateller.c and asterisk1/apps/app_zapateller.c are identical
Files asterisk/apps/app_zapbarge.c and asterisk1/apps/app_zapbarge.c are identical
Files asterisk/apps/app_zapras.c and asterisk1/apps/app_zapras.c are identical
Files asterisk/apps/enter.h and asterisk1/apps/enter.h are identical
Files asterisk/apps/leave.h and asterisk1/apps/leave.h are identical
Files asterisk/ast_expr.y and asterisk1/ast_expr.y are identical
Files asterisk/astconf.h and asterisk1/astconf.h are identical
Files asterisk/asterisk-ng-doxygen and asterisk1/asterisk-ng-doxygen are identical
Files asterisk/asterisk.c and asterisk1/asterisk.c are identical
Files asterisk/asterisk.h and asterisk1/asterisk.h are identical
Files asterisk/astgenkey and asterisk1/astgenkey are identical
Files asterisk/astman/.cvsignore and asterisk1/astman/.cvsignore are identical
Files asterisk/astman/CVS/Entries and asterisk1/astman/CVS/Entries are identical
Files asterisk/astman/CVS/Repository and asterisk1/astman/CVS/Repository are identical
Files asterisk/astman/CVS/Root and asterisk1/astman/CVS/Root are identical
Files asterisk/astman/Makefile and asterisk1/astman/Makefile are identical
Files asterisk/astman/astman.c and asterisk1/astman/astman.c are identical
Files asterisk/astmm.c and asterisk1/astmm.c are identical
Files asterisk/autoservice.c and asterisk1/autoservice.c are identical
Files asterisk/callerid.c and asterisk1/callerid.c are identical
Files asterisk/cdr/.cvsignore and asterisk1/cdr/.cvsignore are identical
Files asterisk/cdr/CVS/Entries and asterisk1/cdr/CVS/Entries are identical
Files asterisk/cdr/CVS/Repository and asterisk1/cdr/CVS/Repository are identical
Files asterisk/cdr/CVS/Root and asterisk1/cdr/CVS/Root are identical
Files asterisk/cdr/Makefile and asterisk1/cdr/Makefile are identical
Files asterisk/cdr/cdr_csv.c and asterisk1/cdr/cdr_csv.c are identical
Files asterisk/cdr/cdr_pgsql.c and asterisk1/cdr/cdr_pgsql.c are identical
Files asterisk/cdr.c and asterisk1/cdr.c are identical
Files asterisk/channel.c and asterisk1/channel.c are identical
Files asterisk/channels/.cvsignore and asterisk1/channels/.cvsignore are identical
Files asterisk/channels/CVS/Entries and asterisk1/channels/CVS/Entries are identical
Files asterisk/channels/CVS/Repository and asterisk1/channels/CVS/Repository are identical
Files asterisk/channels/CVS/Root and asterisk1/channels/CVS/Root are identical
Files asterisk/channels/DialTone.h and asterisk1/channels/DialTone.h are identical
diff -r -C3 -rcs asterisk/channels/Makefile asterisk1/channels/Makefile
*** asterisk/channels/Makefile	Thu Sep 11 15:45:43 2003
--- asterisk1/channels/Makefile	Fri Oct  3 08:37:37 2003
***************
*** 14,20 ****
  OSARCH=$(shell uname -s)
  
  CHANNEL_LIBS=chan_modem.so chan_iax.so chan_sip.so \
! 	     chan_modem_aopen.so chan_oss.so \
               chan_modem_bestdata.so chan_modem_i4l.so \
               chan_agent.so chan_mgcp.so chan_iax2.so \
  	     chan_local.so chan_skinny.so
--- 14,20 ----
  OSARCH=$(shell uname -s)
  
  CHANNEL_LIBS=chan_modem.so chan_iax.so chan_sip.so \
! 	     chan_modem_aopen.so \
               chan_modem_bestdata.so chan_modem_i4l.so \
               chan_agent.so chan_mgcp.so chan_iax2.so \
  	     chan_local.so chan_skinny.so
***************
*** 27,32 ****
--- 27,35 ----
  CHANNEL_LIBS+=$(shell [ -f /usr/include/linux/ixjuser.h ] && echo chan_phone.so)
  CHANNEL_LIBS+=$(shell [ -f h323/libchanh323.a ] && echo chan_h323.so)
  
+ ifneq ($(OSARCH),FreeBSD)
+ CHANNEL_LIBS+=chan_oss.so
+ endif
  CFLAGS+=-Wno-missing-prototypes -Wno-missing-declarations
  CFLAGS+=$(shell [ ! -f /usr/include/linux/if_wanpipe.h ] && echo " -DOLD_SANGOMA_API")
  CHANNEL_LIBS+=$(shell [ -f /usr/include/alsa/asoundlib.h ] && echo "chan_alsa.so")
***************
*** 92,101 ****
  chan_oss.o: chan_oss.c  busy.h ringtone.h
  
  chan_iax2.so: chan_iax2.o iax2-parser.o
! ifeq (${OSARCH},Linux)
  	$(CC) -shared -Xlinker -x -o $@ chan_iax2.o iax2-parser.o
  else
! 	$(CC) -shared -Xlinker -x -o $@ chan_iax2.o iax2-parser.o -lossaudio
  endif
  
  chan_zap.o: $(CHANZAP)
--- 95,104 ----
  chan_oss.o: chan_oss.c  busy.h ringtone.h
  
  chan_iax2.so: chan_iax2.o iax2-parser.o
! ifeq (${OSARCH},FreeBSD)
  	$(CC) -shared -Xlinker -x -o $@ chan_iax2.o iax2-parser.o
  else
! 	$(CC) -shared -Xlinker -x -o $@ chan_iax2.o iax2-parser.o
  endif
  
  chan_zap.o: $(CHANZAP)
Only in asterisk1/channels: Makefile.orig
Files asterisk/channels/adtranvofr.h and asterisk1/channels/adtranvofr.h are identical
Files asterisk/channels/alaw.h and asterisk1/channels/alaw.h are identical
Files asterisk/channels/answer.h and asterisk1/channels/answer.h are identical
Files asterisk/channels/chan_agent.c and asterisk1/channels/chan_agent.c are identical
Files asterisk/channels/chan_alsa.c and asterisk1/channels/chan_alsa.c are identical
Files asterisk/channels/chan_h323.c and asterisk1/channels/chan_h323.c are identical
Files asterisk/channels/chan_iax.c and asterisk1/channels/chan_iax.c are identical
Files asterisk/channels/chan_iax2.c and asterisk1/channels/chan_iax2.c are identical
Files asterisk/channels/chan_local.c and asterisk1/channels/chan_local.c are identical
Files asterisk/channels/chan_mgcp.c and asterisk1/channels/chan_mgcp.c are identical
Files asterisk/channels/chan_modem.c and asterisk1/channels/chan_modem.c are identical
Files asterisk/channels/chan_modem_aopen.c and asterisk1/channels/chan_modem_aopen.c are identical
Files asterisk/channels/chan_modem_bestdata.c and asterisk1/channels/chan_modem_bestdata.c are identical
Files asterisk/channels/chan_modem_i4l.c and asterisk1/channels/chan_modem_i4l.c are identical
Files asterisk/channels/chan_nbs.c and asterisk1/channels/chan_nbs.c are identical
diff -r -C3 -rcs asterisk/channels/chan_oss.c asterisk1/channels/chan_oss.c
*** asterisk/channels/chan_oss.c	Wed Aug 13 11:25:16 2003
--- asterisk1/channels/chan_oss.c	Thu Oct  2 20:38:11 2003
***************
*** 36,42 ****
  #ifdef __linux
  #include <linux/soundcard.h>
  #else
! #include <soundcard.h>
  #endif
  #include "busy.h"
  #include "ringtone.h"
--- 36,42 ----
  #ifdef __linux
  #include <linux/soundcard.h>
  #else
! #include <sys/soundcard.h>
  #endif
  #include "busy.h"
  #include "ringtone.h"
Files asterisk/channels/chan_phone.c and asterisk1/channels/chan_phone.c are identical
Files asterisk/channels/chan_sip.c and asterisk1/channels/chan_sip.c are identical
Files asterisk/channels/chan_skinny.c and asterisk1/channels/chan_skinny.c are identical
Files asterisk/channels/chan_vofr.c and asterisk1/channels/chan_vofr.c are identical
Files asterisk/channels/chan_vpb.c and asterisk1/channels/chan_vpb.c are identical
Files asterisk/channels/chan_zap.c and asterisk1/channels/chan_zap.c are identical
Files asterisk/channels/chan_zap_old.c and asterisk1/channels/chan_zap_old.c are identical
Files asterisk/channels/gentone-ulaw.c and asterisk1/channels/gentone-ulaw.c are identical
Files asterisk/channels/gentone.c and asterisk1/channels/gentone.c are identical
Files asterisk/channels/h323/CVS/Entries and asterisk1/channels/h323/CVS/Entries are identical
Files asterisk/channels/h323/CVS/Repository and asterisk1/channels/h323/CVS/Repository are identical
Files asterisk/channels/h323/CVS/Root and asterisk1/channels/h323/CVS/Root are identical
Files asterisk/channels/h323/ChangeLog and asterisk1/channels/h323/ChangeLog are identical
Files asterisk/channels/h323/INSTALL.openh323 and asterisk1/channels/h323/INSTALL.openh323 are identical
Files asterisk/channels/h323/Makefile and asterisk1/channels/h323/Makefile are identical
Files asterisk/channels/h323/README and asterisk1/channels/h323/README are identical
Files asterisk/channels/h323/TODO and asterisk1/channels/h323/TODO are identical
Files asterisk/channels/h323/ast_h323.cpp and asterisk1/channels/h323/ast_h323.cpp are identical
Files asterisk/channels/h323/ast_h323.h and asterisk1/channels/h323/ast_h323.h are identical
Files asterisk/channels/h323/chan_h323.h and asterisk1/channels/h323/chan_h323.h are identical
Files asterisk/channels/h323/h323.conf.sample and asterisk1/channels/h323/h323.conf.sample are identical
Files asterisk/channels/iax.h and asterisk1/channels/iax.h are identical
Files asterisk/channels/iax2-parser.c and asterisk1/channels/iax2-parser.c are identical
Files asterisk/channels/iax2-parser.h and asterisk1/channels/iax2-parser.h are identical
Files asterisk/channels/iax2.h and asterisk1/channels/iax2.h are identical
Files asterisk/channels/ixjuser.h and asterisk1/channels/ixjuser.h are identical
Files asterisk/channels/ring10.h and asterisk1/channels/ring10.h are identical
Files asterisk/chanvars.c and asterisk1/chanvars.c are identical
Files asterisk/cli.c and asterisk1/cli.c are identical
Files asterisk/codecs/.cvsignore and asterisk1/codecs/.cvsignore are identical
diff -r -C3 -rcs asterisk/codecs/CVS/Entries asterisk1/codecs/CVS/Entries
*** asterisk/codecs/CVS/Entries	Fri Oct  3 13:43:29 2003
--- asterisk1/codecs/CVS/Entries	Thu Oct  2 18:50:57 2003
***************
*** 2,8 ****
  /Makefile/1.5/Tue May  6 00:00:20 2003//
  /adpcm_slin_ex.h/1.1.1.1/Wed Feb 12 13:59:14 2003//
  /codec_a_mu.c/1.2/Wed Aug 13 15:25:16 2003//
! /codec_adpcm.c/1.3/Thu Oct  2 23:17:31 2003//
  /codec_alaw.c/1.2/Wed Aug 13 15:25:16 2003//
  /codec_g723_1.c/1.5/Sat Sep 27 02:45:37 2003//
  /codec_gsm.c/1.2/Wed Aug 13 15:25:16 2003//
--- 2,8 ----
  /Makefile/1.5/Tue May  6 00:00:20 2003//
  /adpcm_slin_ex.h/1.1.1.1/Wed Feb 12 13:59:14 2003//
  /codec_a_mu.c/1.2/Wed Aug 13 15:25:16 2003//
! /codec_adpcm.c/1.2/Wed Aug 13 15:25:16 2003//
  /codec_alaw.c/1.2/Wed Aug 13 15:25:16 2003//
  /codec_g723_1.c/1.5/Sat Sep 27 02:45:37 2003//
  /codec_gsm.c/1.2/Wed Aug 13 15:25:16 2003//
Files asterisk/codecs/CVS/Repository and asterisk1/codecs/CVS/Repository are identical
Files asterisk/codecs/CVS/Root and asterisk1/codecs/CVS/Root are identical
diff -r -C3 -rcs asterisk/codecs/Makefile asterisk1/codecs/Makefile
*** asterisk/codecs/Makefile	Mon May  5 20:00:20 2003
--- asterisk1/codecs/Makefile	Fri Oct  3 08:37:37 2003
***************
*** 19,25 ****
--- 19,27 ----
  #MODG723=codec_g723_1.so codec_g723_1b.so
  MODG723=$(shell [ -f g723.1/coder.c ] && echo "codec_g723_1.so")
  MODG723+=$(shell [ -f g723.1b/coder2.c ] && echo "codec_g723_1b.so")
+ ifneq (${OSARCH},FreeBSD)
  MODSPEEX=$(shell [ -f /usr/include/speex.h ] || [ -f /usr/local/include/speex.h ] && echo "codec_speex.so")
+ endif
  MODILBC=$(shell [ -f ilbc/iLBC_decode.h ] && echo "codec_ilbc.so")
  CFLAGS+=-fPIC
  
***************
*** 30,36 ****
--- 32,42 ----
  LIBGSMT=$(shell if uname -m | grep -q 86; then echo gsm/lib/libgsm.a; fi)
  LIBMP3=mp3/libmp3.a
  LIBLPC10=lpc10/liblpc10.a
+ ifeq (${OSARCH},Linux)
  LIBSPEEX=-lspeex -lm
+ else
+ LIBSPEEX=-lm
+ endif
  LIBILBC=ilbc/libilbc.a
  
  CODECS+=$(MODG723) $(MODSPEEX) $(MODILBC) codec_gsm.so codec_mp3_d.so codec_lpc10.so  \
Files asterisk/codecs/adpcm_slin_ex.h and asterisk1/codecs/adpcm_slin_ex.h are identical
Files asterisk/codecs/codec_a_mu.c and asterisk1/codecs/codec_a_mu.c are identical
diff -r -C3 -rcs asterisk/codecs/codec_adpcm.c asterisk1/codecs/codec_adpcm.c
*** asterisk/codecs/codec_adpcm.c	Thu Oct  2 19:17:31 2003
--- asterisk1/codecs/codec_adpcm.c	Wed Aug 13 11:25:16 2003
***************
*** 27,33 ****
  #include <unistd.h>
  
  #define BUFFER_SIZE   8096	/* size for the translation buffers */
- #define BUF_SHIFT	5
  
  static ast_mutex_t localuser_lock = AST_MUTEX_INITIALIZER;
  static int localusecnt = 0;
--- 27,32 ----
***************
*** 78,125 ****
   *  Sets the index to the step size table for the next encode.
   */
  
! static inline void 
! decode (unsigned char encoded, short *ssindex, short *signal, unsigned char *rkey, unsigned char *next)
  {
    short diff, step;
    step = stpsz[*ssindex];
! 
!   diff = step * nbl2bit[encoded][1] +
! 		(step >> 1) * nbl2bit[encoded][2] +
! 		(step >> 2) * nbl2bit[encoded][3] +
! 		(step >> 3);
!   if (nbl2bit[encoded][2] && (step & 0x1))
! 	diff++;
!   diff *= nbl2bit[encoded][0];
! 
!   if ( *next & 0x1 )
!         *signal -= 8;
!   else if ( *next & 0x2 )
!         *signal += 8;
! 
!   *signal += diff;
! 
!   if (*signal > 2047)
! 	*signal = 2047;
!   else if (*signal < -2047)
! 	*signal = -2047;
! 
!   *next = 0;
!   if( encoded & 0x7 )
!         *rkey = 0;
!   else if ( ++(*rkey) == 24 ) {
! 	*rkey = 0;
! 	if (*signal > 0)
! 		*next = 0x1;
! 	else if (*signal < 0)
! 		*next = 0x2;
!   }
! 
    *ssindex = *ssindex + indsft[(encoded & 7)];
    if (*ssindex < 0)
      *ssindex = 0;
    else if (*ssindex > 48)
      *ssindex = 48;
  }
  
  /*
--- 77,97 ----
   *  Sets the index to the step size table for the next encode.
   */
  
! static inline short
! decode (unsigned char encoded, short *ssindex)
  {
    short diff, step;
    step = stpsz[*ssindex];
!   diff = nbl2bit[encoded][0] * (step * nbl2bit[encoded][1] +
! 				(step >> 1) * nbl2bit[encoded][2] +
! 				(step >> 2) * nbl2bit[encoded][3] +
! 				(step >> 3));
    *ssindex = *ssindex + indsft[(encoded & 7)];
    if (*ssindex < 0)
      *ssindex = 0;
    else if (*ssindex > 48)
      *ssindex = 48;
+   return (diff);
  }
  
  /*
***************
*** 135,141 ****
   */
  
  static inline unsigned char
! adpcm (short csig, short *ssindex, short *signal, unsigned char *rkey, unsigned char *next)
  {
    short diff, step;
    unsigned char encoded;
--- 107,113 ----
   */
  
  static inline unsigned char
! adpcm (short csig, short *ssindex, short *signal)
  {
    short diff, step;
    unsigned char encoded;
***************
*** 170,176 ****
    if (diff >= step)
      encoded |= 1;
      
!   decode (encoded, ssindex, signal, rkey, next);
    return (encoded);
  }
  
--- 142,148 ----
    if (diff >= step)
      encoded |= 1;
      
!   *signal += decode (encoded, ssindex);
    return (encoded);
  }
  
***************
*** 186,193 ****
    unsigned char outbuf[BUFFER_SIZE];  /* Encoded ADPCM, two nibbles to a word */
    short ssindex;
    short signal;
-   unsigned char zero_count;
-   unsigned char next_flag;
    int tail;
  };
  
--- 158,163 ----
***************
*** 275,289 ****
    short signal;
    short ssindex;
    unsigned char *b;
-   unsigned char zero_count;
-   unsigned char next_flag;
  
!   if (f->datalen < BUF_SHIFT) {
!   	ast_log(LOG_WARNING, "Didn't have at least %d bytes of input\n", BUF_SHIFT);
  	return -1;
    }
  
!   if ((f->datalen - BUF_SHIFT) * 4 > sizeof(tmp->outbuf)) {
    	ast_log(LOG_WARNING, "Out of buffer space\n");
  	return -1;
    }
--- 245,257 ----
    short signal;
    short ssindex;
    unsigned char *b;
  
!   if (f->datalen < 3) {
!   	ast_log(LOG_WARNING, "Didn't have at least three bytes of input\n");
  	return -1;
    }
  
!   if ((f->datalen - 3) * 4 > sizeof(tmp->outbuf)) {
    	ast_log(LOG_WARNING, "Out of buffer space\n");
  	return -1;
    }
***************
*** 297,312 ****
      ssindex = 48;
  
    signal = (b[1] << 8) | b[2]; 
! 
!   zero_count = b[3];
!   next_flag = b[4];
! 
!   for (x=BUF_SHIFT;x<f->datalen;x++) {
! 	decode((b[x] >> 4) & 0xf, &ssindex, &signal, &zero_count, &next_flag);
! 	tmp->outbuf[tmp->tail++] = signal << 4;
! 
! 	decode(b[x] & 0x0f, &ssindex, &signal, &zero_count, &next_flag);
! 	tmp->outbuf[tmp->tail++] = signal << 4;
    }
  
    return 0;
--- 265,284 ----
      ssindex = 48;
  
    signal = (b[1] << 8) | b[2]; 
!   
!   for (x=3;x<f->datalen;x++) {
!   	signal += decode(b[x] >> 4, &ssindex);
! 	if (signal > 2047)
! 		signal = 2047;
! 	if (signal < -2048)
! 		signal = -2048;
!     tmp->outbuf[tmp->tail++] = signal << 4;
!   	signal +=  decode(b[x] & 0x0f, &ssindex);
! 	if (signal > 2047)
! 		signal = 2047;
! 	if (signal < -2048)
! 		signal = -2048;
!     tmp->outbuf[tmp->tail++] = signal << 4;
    }
  
    return 0;
***************
*** 400,414 ****
    tmp->outbuf[0] = tmp->ssindex & 0xff;
    tmp->outbuf[1] = (tmp->signal >> 8) & 0xff;
    tmp->outbuf[2] = (tmp->signal & 0xff);
-   tmp->outbuf[3] = tmp->zero_count;
-   tmp->outbuf[4] = tmp->next_flag;
  
    for (i = 0; i < i_max; i+=2)
    {
!     adpcm0 = adpcm (tmp->inbuf[i], &tmp->ssindex, &tmp->signal, &tmp->zero_count, &tmp->next_flag);
!     adpcm1 = adpcm (tmp->inbuf[i+1], &tmp->ssindex, &tmp->signal, &tmp->zero_count, &tmp->next_flag);
! 
!     tmp->outbuf[i/2 + BUF_SHIFT] = (adpcm0 << 4) | adpcm1;
    };
  
  
--- 372,383 ----
    tmp->outbuf[0] = tmp->ssindex & 0xff;
    tmp->outbuf[1] = (tmp->signal >> 8) & 0xff;
    tmp->outbuf[2] = (tmp->signal & 0xff);
  
    for (i = 0; i < i_max; i+=2)
    {
!     adpcm0 = adpcm(tmp->inbuf[i], &tmp->ssindex, &tmp->signal);
!     adpcm1 = adpcm(tmp->inbuf[i+1], &tmp->ssindex, &tmp->signal);
!     tmp->outbuf[i/2 + 3] = (adpcm0 << 4) | adpcm1;
    };
  
  
***************
*** 419,425 ****
    tmp->f.offset = AST_FRIENDLY_OFFSET;
    tmp->f.src = __PRETTY_FUNCTION__;
    tmp->f.data = tmp->outbuf;
!   tmp->f.datalen = i_max / 2 + BUF_SHIFT;
  
    /*
     * If there is a signal left over (there should be no more than
--- 388,394 ----
    tmp->f.offset = AST_FRIENDLY_OFFSET;
    tmp->f.src = __PRETTY_FUNCTION__;
    tmp->f.data = tmp->outbuf;
!   tmp->f.datalen = i_max / 2 + 3;
  
    /*
     * If there is a signal left over (there should be no more than
Files asterisk/codecs/codec_alaw.c and asterisk1/codecs/codec_alaw.c are identical
Files asterisk/codecs/codec_g723_1.c and asterisk1/codecs/codec_g723_1.c are identical
Files asterisk/codecs/codec_gsm.c and asterisk1/codecs/codec_gsm.c are identical
Files asterisk/codecs/codec_ilbc.c and asterisk1/codecs/codec_ilbc.c are identical
Files asterisk/codecs/codec_lpc10.c and asterisk1/codecs/codec_lpc10.c are identical
Files asterisk/codecs/codec_mp3_d.c and asterisk1/codecs/codec_mp3_d.c are identical
Files asterisk/codecs/codec_speex.c and asterisk1/codecs/codec_speex.c are identical
Files asterisk/codecs/codec_ulaw.c and asterisk1/codecs/codec_ulaw.c are identical
Files asterisk/codecs/g723_slin_ex.h and asterisk1/codecs/g723_slin_ex.h are identical
Files asterisk/codecs/gsm/.cvsignore and asterisk1/codecs/gsm/.cvsignore are identical
Files asterisk/codecs/gsm/COPYRIGHT and asterisk1/codecs/gsm/COPYRIGHT are identical
Files asterisk/codecs/gsm/CVS/Entries and asterisk1/codecs/gsm/CVS/Entries are identical
Files asterisk/codecs/gsm/CVS/Repository and asterisk1/codecs/gsm/CVS/Repository are identical
Files asterisk/codecs/gsm/CVS/Root and asterisk1/codecs/gsm/CVS/Root are identical
diff -r -C3 -rcs asterisk/codecs/gsm/Makefile asterisk1/codecs/gsm/Makefile
*** asterisk/codecs/gsm/Makefile	Fri Sep 26 22:45:37 2003
--- asterisk1/codecs/gsm/Makefile	Fri Oct  3 09:13:19 2003
***************
*** 54,60 ****
  # CC		= /usr/lang/acc
  # CCFLAGS 	= -c -O
  
! CC		= gcc $(OPTIMIZE) -march=$(PROC) -fomit-frame-pointer 
  CCFLAGS 	+= -c -DNeedFunctionPrototypes=1 -funroll-loops -fPIC
  
  LD 		= $(CC)
--- 54,66 ----
  # CC		= /usr/lang/acc
  # CCFLAGS 	= -c -O
  
! CC             = gcc -ansi -pedantic $(OPTIMIZE) -fschedule-insns2  -fomit-frame-pointer
! 
! ifneq ($(OSARCH),FreeBSD)
! CC             += -march=$(PROC)
! endif
! 
! 
  CCFLAGS 	+= -c -DNeedFunctionPrototypes=1 -funroll-loops -fPIC
  
  LD 		= $(CC)
Files asterisk/codecs/gsm/README and asterisk1/codecs/gsm/README are identical
Files asterisk/codecs/gsm/inc/CVS/Entries and asterisk1/codecs/gsm/inc/CVS/Entries are identical
Files asterisk/codecs/gsm/inc/CVS/Repository and asterisk1/codecs/gsm/inc/CVS/Repository are identical
Files asterisk/codecs/gsm/inc/CVS/Root and asterisk1/codecs/gsm/inc/CVS/Root are identical
Files asterisk/codecs/gsm/inc/config.h and asterisk1/codecs/gsm/inc/config.h are identical
Files asterisk/codecs/gsm/inc/gsm.h and asterisk1/codecs/gsm/inc/gsm.h are identical
Files asterisk/codecs/gsm/inc/private.h and asterisk1/codecs/gsm/inc/private.h are identical
Files asterisk/codecs/gsm/inc/proto.h and asterisk1/codecs/gsm/inc/proto.h are identical
Files asterisk/codecs/gsm/inc/unproto.h and asterisk1/codecs/gsm/inc/unproto.h are identical
Only in asterisk1/codecs/gsm: lib
Files asterisk/codecs/gsm/src/CVS/Entries and asterisk1/codecs/gsm/src/CVS/Entries are identical
Files asterisk/codecs/gsm/src/CVS/Repository and asterisk1/codecs/gsm/src/CVS/Repository are identical
Files asterisk/codecs/gsm/src/CVS/Root and asterisk1/codecs/gsm/src/CVS/Root are identical
Files asterisk/codecs/gsm/src/add.c and asterisk1/codecs/gsm/src/add.c are identical
Files asterisk/codecs/gsm/src/code.c and asterisk1/codecs/gsm/src/code.c are identical
Files asterisk/codecs/gsm/src/debug.c and asterisk1/codecs/gsm/src/debug.c are identical
Files asterisk/codecs/gsm/src/decode.c and asterisk1/codecs/gsm/src/decode.c are identical
Files asterisk/codecs/gsm/src/gsm_create.c and asterisk1/codecs/gsm/src/gsm_create.c are identical
Files asterisk/codecs/gsm/src/gsm_decode.c and asterisk1/codecs/gsm/src/gsm_decode.c are identical
Files asterisk/codecs/gsm/src/gsm_destroy.c and asterisk1/codecs/gsm/src/gsm_destroy.c are identical
Files asterisk/codecs/gsm/src/gsm_encode.c and asterisk1/codecs/gsm/src/gsm_encode.c are identical
Files asterisk/codecs/gsm/src/gsm_explode.c and asterisk1/codecs/gsm/src/gsm_explode.c are identical
Files asterisk/codecs/gsm/src/gsm_implode.c and asterisk1/codecs/gsm/src/gsm_implode.c are identical
Files asterisk/codecs/gsm/src/gsm_option.c and asterisk1/codecs/gsm/src/gsm_option.c are identical
Files asterisk/codecs/gsm/src/gsm_print.c and asterisk1/codecs/gsm/src/gsm_print.c are identical
Files asterisk/codecs/gsm/src/k6opt.h and asterisk1/codecs/gsm/src/k6opt.h are identical
Files asterisk/codecs/gsm/src/k6opt.s and asterisk1/codecs/gsm/src/k6opt.s are identical
Files asterisk/codecs/gsm/src/long_term.c and asterisk1/codecs/gsm/src/long_term.c are identical
Files asterisk/codecs/gsm/src/lpc.c and asterisk1/codecs/gsm/src/lpc.c are identical
Files asterisk/codecs/gsm/src/preprocess.c and asterisk1/codecs/gsm/src/preprocess.c are identical
Files asterisk/codecs/gsm/src/rpe.c and asterisk1/codecs/gsm/src/rpe.c are identical
Files asterisk/codecs/gsm/src/short_term.c and asterisk1/codecs/gsm/src/short_term.c are identical
Files asterisk/codecs/gsm/src/table.c and asterisk1/codecs/gsm/src/table.c are identical
Files asterisk/codecs/gsm_slin_ex.h and asterisk1/codecs/gsm_slin_ex.h are identical
Files asterisk/codecs/ilbc/CVS/Entries and asterisk1/codecs/ilbc/CVS/Entries are identical
Files asterisk/codecs/ilbc/CVS/Repository and asterisk1/codecs/ilbc/CVS/Repository are identical
Files asterisk/codecs/ilbc/CVS/Root and asterisk1/codecs/ilbc/CVS/Root are identical
Files asterisk/codecs/ilbc/FrameClassify.c and asterisk1/codecs/ilbc/FrameClassify.c are identical
Files asterisk/codecs/ilbc/FrameClassify.h and asterisk1/codecs/ilbc/FrameClassify.h are identical
Files asterisk/codecs/ilbc/LPCdecode.c and asterisk1/codecs/ilbc/LPCdecode.c are identical
Files asterisk/codecs/ilbc/LPCdecode.h and asterisk1/codecs/ilbc/LPCdecode.h are identical
Files asterisk/codecs/ilbc/LPCencode.c and asterisk1/codecs/ilbc/LPCencode.c are identical
Files asterisk/codecs/ilbc/LPCencode.h and asterisk1/codecs/ilbc/LPCencode.h are identical
Files asterisk/codecs/ilbc/Makefile and asterisk1/codecs/ilbc/Makefile are identical
Files asterisk/codecs/ilbc/StateConstructW.c and asterisk1/codecs/ilbc/StateConstructW.c are identical
Files asterisk/codecs/ilbc/StateConstructW.h and asterisk1/codecs/ilbc/StateConstructW.h are identical
Files asterisk/codecs/ilbc/StateSearchW.c and asterisk1/codecs/ilbc/StateSearchW.c are identical
Files asterisk/codecs/ilbc/StateSearchW.h and asterisk1/codecs/ilbc/StateSearchW.h are identical
Files asterisk/codecs/ilbc/anaFilter.c and asterisk1/codecs/ilbc/anaFilter.c are identical
Files asterisk/codecs/ilbc/anaFilter.h and asterisk1/codecs/ilbc/anaFilter.h are identical
Files asterisk/codecs/ilbc/constants.c and asterisk1/codecs/ilbc/constants.c are identical
Files asterisk/codecs/ilbc/constants.h and asterisk1/codecs/ilbc/constants.h are identical
Files asterisk/codecs/ilbc/createCB.c and asterisk1/codecs/ilbc/createCB.c are identical
Files asterisk/codecs/ilbc/createCB.h and asterisk1/codecs/ilbc/createCB.h are identical
Files asterisk/codecs/ilbc/doCPLC.c and asterisk1/codecs/ilbc/doCPLC.c are identical
Files asterisk/codecs/ilbc/doCPLC.h and asterisk1/codecs/ilbc/doCPLC.h are identical
Files asterisk/codecs/ilbc/enhancer.c and asterisk1/codecs/ilbc/enhancer.c are identical
Files asterisk/codecs/ilbc/enhancer.h and asterisk1/codecs/ilbc/enhancer.h are identical
Files asterisk/codecs/ilbc/filter.c and asterisk1/codecs/ilbc/filter.c are identical
Files asterisk/codecs/ilbc/filter.h and asterisk1/codecs/ilbc/filter.h are identical
Files asterisk/codecs/ilbc/gainquant.c and asterisk1/codecs/ilbc/gainquant.c are identical
Files asterisk/codecs/ilbc/gainquant.h and asterisk1/codecs/ilbc/gainquant.h are identical
Files asterisk/codecs/ilbc/getCBvec.c and asterisk1/codecs/ilbc/getCBvec.c are identical
Files asterisk/codecs/ilbc/getCBvec.h and asterisk1/codecs/ilbc/getCBvec.h are identical
Files asterisk/codecs/ilbc/helpfun.c and asterisk1/codecs/ilbc/helpfun.c are identical
Files asterisk/codecs/ilbc/helpfun.h and asterisk1/codecs/ilbc/helpfun.h are identical
Files asterisk/codecs/ilbc/hpInput.c and asterisk1/codecs/ilbc/hpInput.c are identical
Files asterisk/codecs/ilbc/hpInput.h and asterisk1/codecs/ilbc/hpInput.h are identical
Files asterisk/codecs/ilbc/hpOutput.c and asterisk1/codecs/ilbc/hpOutput.c are identical
Files asterisk/codecs/ilbc/hpOutput.h and asterisk1/codecs/ilbc/hpOutput.h are identical
Files asterisk/codecs/ilbc/iCBConstruct.c and asterisk1/codecs/ilbc/iCBConstruct.c are identical
Files asterisk/codecs/ilbc/iCBConstruct.h and asterisk1/codecs/ilbc/iCBConstruct.h are identical
Files asterisk/codecs/ilbc/iCBSearch.c and asterisk1/codecs/ilbc/iCBSearch.c are identical
Files asterisk/codecs/ilbc/iCBSearch.h and asterisk1/codecs/ilbc/iCBSearch.h are identical
Files asterisk/codecs/ilbc/iLBC_decode.c and asterisk1/codecs/ilbc/iLBC_decode.c are identical
Files asterisk/codecs/ilbc/iLBC_decode.h and asterisk1/codecs/ilbc/iLBC_decode.h are identical
Files asterisk/codecs/ilbc/iLBC_define.h and asterisk1/codecs/ilbc/iLBC_define.h are identical
Files asterisk/codecs/ilbc/iLBC_encode.c and asterisk1/codecs/ilbc/iLBC_encode.c are identical
Files asterisk/codecs/ilbc/iLBC_encode.h and asterisk1/codecs/ilbc/iLBC_encode.h are identical
Files asterisk/codecs/ilbc/lsf.c and asterisk1/codecs/ilbc/lsf.c are identical
Files asterisk/codecs/ilbc/lsf.h and asterisk1/codecs/ilbc/lsf.h are identical
Files asterisk/codecs/ilbc/packing.c and asterisk1/codecs/ilbc/packing.c are identical
Files asterisk/codecs/ilbc/packing.h and asterisk1/codecs/ilbc/packing.h are identical
Files asterisk/codecs/ilbc/syntFilter.c and asterisk1/codecs/ilbc/syntFilter.c are identical
Files asterisk/codecs/ilbc/syntFilter.h and asterisk1/codecs/ilbc/syntFilter.h are identical
Files asterisk/codecs/ilbc_slin_ex.h and asterisk1/codecs/ilbc_slin_ex.h are identical
Files asterisk/codecs/lpc10/CVS/Entries and asterisk1/codecs/lpc10/CVS/Entries are identical
Files asterisk/codecs/lpc10/CVS/Repository and asterisk1/codecs/lpc10/CVS/Repository are identical
Files asterisk/codecs/lpc10/CVS/Root and asterisk1/codecs/lpc10/CVS/Root are identical
diff -r -C3 -rcs asterisk/codecs/lpc10/Makefile asterisk1/codecs/lpc10/Makefile
*** asterisk/codecs/lpc10/Makefile	Sun Apr 27 14:13:11 2003
--- asterisk1/codecs/lpc10/Makefile	Fri Oct  3 08:37:37 2003
***************
*** 27,33 ****
  
  #fix for PPC processors
  ifneq ($(PROC),ppc)
! 	CFLAGS+= -march=$(PROC)
  endif
  
  LIB = $(LIB_TARGET_DIR)/liblpc10.a
--- 27,35 ----
  
  #fix for PPC processors
  ifneq ($(PROC),ppc)
! 	ifneq ($(OSARCH),FreeBSD)
! 		CFLAGS+= -march=$(PROC)
! 	endif
  endif
  
  LIB = $(LIB_TARGET_DIR)/liblpc10.a
Only in asterisk1/codecs/lpc10: Makefile.orig
Files asterisk/codecs/lpc10/README and asterisk1/codecs/lpc10/README are identical
Files asterisk/codecs/lpc10/analys.c and asterisk1/codecs/lpc10/analys.c are identical
Files asterisk/codecs/lpc10/bsynz.c and asterisk1/codecs/lpc10/bsynz.c are identical
Files asterisk/codecs/lpc10/chanwr.c and asterisk1/codecs/lpc10/chanwr.c are identical
Files asterisk/codecs/lpc10/dcbias.c and asterisk1/codecs/lpc10/dcbias.c are identical
Files asterisk/codecs/lpc10/decode.c and asterisk1/codecs/lpc10/decode.c are identical
Files asterisk/codecs/lpc10/deemp.c and asterisk1/codecs/lpc10/deemp.c are identical
Files asterisk/codecs/lpc10/difmag.c and asterisk1/codecs/lpc10/difmag.c are identical
Files asterisk/codecs/lpc10/dyptrk.c and asterisk1/codecs/lpc10/dyptrk.c are identical
Files asterisk/codecs/lpc10/encode.c and asterisk1/codecs/lpc10/encode.c are identical
Files asterisk/codecs/lpc10/energy.c and asterisk1/codecs/lpc10/energy.c are identical
Files asterisk/codecs/lpc10/f2c.h and asterisk1/codecs/lpc10/f2c.h are identical
Files asterisk/codecs/lpc10/f2clib.c and asterisk1/codecs/lpc10/f2clib.c are identical
Files asterisk/codecs/lpc10/ham84.c and asterisk1/codecs/lpc10/ham84.c are identical
Files asterisk/codecs/lpc10/hp100.c and asterisk1/codecs/lpc10/hp100.c are identical
Files asterisk/codecs/lpc10/invert.c and asterisk1/codecs/lpc10/invert.c are identical
Files asterisk/codecs/lpc10/irc2pc.c and asterisk1/codecs/lpc10/irc2pc.c are identical
Files asterisk/codecs/lpc10/ivfilt.c and asterisk1/codecs/lpc10/ivfilt.c are identical
Files asterisk/codecs/lpc10/lpc10.h and asterisk1/codecs/lpc10/lpc10.h are identical
Files asterisk/codecs/lpc10/lpcdec.c and asterisk1/codecs/lpc10/lpcdec.c are identical
Files asterisk/codecs/lpc10/lpcenc.c and asterisk1/codecs/lpc10/lpcenc.c are identical
diff -r -C3 -rcs asterisk/codecs/lpc10/lpcini.c asterisk1/codecs/lpc10/lpcini.c
*** asterisk/codecs/lpc10/lpcini.c	Wed Feb 12 08:59:15 2003
--- asterisk1/codecs/lpc10/lpcini.c	Fri Oct  3 12:48:43 2003
***************
*** 31,37 ****
  
  #include "f2c.h"
  
! #include <malloc.h>
  
  /* Common Block Declarations */
  
--- 31,37 ----
  
  #include "f2c.h"
  
! #include <stdlib.h>
  
  /* Common Block Declarations */
  
Files asterisk/codecs/lpc10/lpfilt.c and asterisk1/codecs/lpc10/lpfilt.c are identical
Files asterisk/codecs/lpc10/median.c and asterisk1/codecs/lpc10/median.c are identical
Files asterisk/codecs/lpc10/mload.c and asterisk1/codecs/lpc10/mload.c are identical
Files asterisk/codecs/lpc10/onset.c and asterisk1/codecs/lpc10/onset.c are identical
Files asterisk/codecs/lpc10/pitsyn.c and asterisk1/codecs/lpc10/pitsyn.c are identical
Files asterisk/codecs/lpc10/placea.c and asterisk1/codecs/lpc10/placea.c are identical
Files asterisk/codecs/lpc10/placev.c and asterisk1/codecs/lpc10/placev.c are identical
Files asterisk/codecs/lpc10/preemp.c and asterisk1/codecs/lpc10/preemp.c are identical
Files asterisk/codecs/lpc10/prepro.c and asterisk1/codecs/lpc10/prepro.c are identical
Files asterisk/codecs/lpc10/random.c and asterisk1/codecs/lpc10/random.c are identical
Files asterisk/codecs/lpc10/rcchk.c and asterisk1/codecs/lpc10/rcchk.c are identical
Files asterisk/codecs/lpc10/synths.c and asterisk1/codecs/lpc10/synths.c are identical
Files asterisk/codecs/lpc10/tbdm.c and asterisk1/codecs/lpc10/tbdm.c are identical
Files asterisk/codecs/lpc10/voicin.c and asterisk1/codecs/lpc10/voicin.c are identical
Files asterisk/codecs/lpc10/vparms.c and asterisk1/codecs/lpc10/vparms.c are identical
Files asterisk/codecs/lpc10_slin_ex.h and asterisk1/codecs/lpc10_slin_ex.h are identical
Files asterisk/codecs/mp3/CVS/Entries and asterisk1/codecs/mp3/CVS/Entries are identical
Files asterisk/codecs/mp3/CVS/Repository and asterisk1/codecs/mp3/CVS/Repository are identical
Files asterisk/codecs/mp3/CVS/Root and asterisk1/codecs/mp3/CVS/Root are identical
Files asterisk/codecs/mp3/Makefile and asterisk1/codecs/mp3/Makefile are identical
Files asterisk/codecs/mp3/include/CVS/Entries and asterisk1/codecs/mp3/include/CVS/Entries are identical
Files asterisk/codecs/mp3/include/CVS/Repository and asterisk1/codecs/mp3/include/CVS/Repository are identical
Files asterisk/codecs/mp3/include/CVS/Root and asterisk1/codecs/mp3/include/CVS/Root are identical
diff -r -C3 -rcs asterisk/codecs/mp3/include/L3.h asterisk1/codecs/mp3/include/L3.h
*** asterisk/codecs/mp3/include/L3.h	Wed Feb 12 08:59:14 2003
--- asterisk1/codecs/mp3/include/L3.h	Fri Oct  3 08:37:37 2003
***************
*** 33,42 ****
  
  ******************************************************************/
  
  #define GLOBAL_GAIN_SCALE (4*15)
  /* #define GLOBAL_GAIN_SCALE 0 */
  
- 
  #ifdef _M_IX86
  #define LITTLE_ENDIAN 1
  #endif
--- 33,45 ----
  
  ******************************************************************/
  
+ #ifdef __FreeBSD__
+ #include <machine/endian.h>
+ #endif
+ 
  #define GLOBAL_GAIN_SCALE (4*15)
  /* #define GLOBAL_GAIN_SCALE 0 */
  
  #ifdef _M_IX86
  #define LITTLE_ENDIAN 1
  #endif
***************
*** 48,53 ****
--- 51,57 ----
  #ifdef sparc
  #define LITTLE_ENDIAN 0
  #endif
+ 
  
  #ifndef LITTLE_ENDIAN
  #error Layer III LITTLE_ENDIAN must be defined 0 or 1
Only in asterisk1/codecs/mp3/include: L3.h.orig
Files asterisk/codecs/mp3/include/htable.h and asterisk1/codecs/mp3/include/htable.h are identical
Files asterisk/codecs/mp3/include/itype.h and asterisk1/codecs/mp3/include/itype.h are identical
Files asterisk/codecs/mp3/include/jdw.h and asterisk1/codecs/mp3/include/jdw.h are identical
Files asterisk/codecs/mp3/include/mhead.h and asterisk1/codecs/mp3/include/mhead.h are identical
Files asterisk/codecs/mp3/include/port.h and asterisk1/codecs/mp3/include/port.h are identical
Files asterisk/codecs/mp3/include/protos.h and asterisk1/codecs/mp3/include/protos.h are identical
Files asterisk/codecs/mp3/include/tableawd.h and asterisk1/codecs/mp3/include/tableawd.h are identical
Files asterisk/codecs/mp3/include/xinglmc.h and asterisk1/codecs/mp3/include/xinglmc.h are identical
Files asterisk/codecs/mp3/src/CVS/Entries and asterisk1/codecs/mp3/src/CVS/Entries are identical
Files asterisk/codecs/mp3/src/CVS/Repository and asterisk1/codecs/mp3/src/CVS/Repository are identical
Files asterisk/codecs/mp3/src/CVS/Root and asterisk1/codecs/mp3/src/CVS/Root are identical
Files asterisk/codecs/mp3/src/cdct.c and asterisk1/codecs/mp3/src/cdct.c are identical
Files asterisk/codecs/mp3/src/csbt.c and asterisk1/codecs/mp3/src/csbt.c are identical
Files asterisk/codecs/mp3/src/csbtL3.c and asterisk1/codecs/mp3/src/csbtL3.c are identical
Files asterisk/codecs/mp3/src/csbtb.c and asterisk1/codecs/mp3/src/csbtb.c are identical
Files asterisk/codecs/mp3/src/cup.c and asterisk1/codecs/mp3/src/cup.c are identical
Files asterisk/codecs/mp3/src/cupL1.c and asterisk1/codecs/mp3/src/cupL1.c are identical
Files asterisk/codecs/mp3/src/cupini.c and asterisk1/codecs/mp3/src/cupini.c are identical
Files asterisk/codecs/mp3/src/cupl3.c and asterisk1/codecs/mp3/src/cupl3.c are identical
Files asterisk/codecs/mp3/src/cwin.c and asterisk1/codecs/mp3/src/cwin.c are identical
Files asterisk/codecs/mp3/src/cwinb.c and asterisk1/codecs/mp3/src/cwinb.c are identical
Files asterisk/codecs/mp3/src/cwinm.c and asterisk1/codecs/mp3/src/cwinm.c are identical
Files asterisk/codecs/mp3/src/dec8.c and asterisk1/codecs/mp3/src/dec8.c are identical
Files asterisk/codecs/mp3/src/hwin.c and asterisk1/codecs/mp3/src/hwin.c are identical
Files asterisk/codecs/mp3/src/icdct.c and asterisk1/codecs/mp3/src/icdct.c are identical
Files asterisk/codecs/mp3/src/isbt.c and asterisk1/codecs/mp3/src/isbt.c are identical
Files asterisk/codecs/mp3/src/isbtb.c and asterisk1/codecs/mp3/src/isbtb.c are identical
Files asterisk/codecs/mp3/src/iup.c and asterisk1/codecs/mp3/src/iup.c are identical
Files asterisk/codecs/mp3/src/iupL1.c and asterisk1/codecs/mp3/src/iupL1.c are identical
Files asterisk/codecs/mp3/src/iupini.c and asterisk1/codecs/mp3/src/iupini.c are identical
Files asterisk/codecs/mp3/src/iwinQ.c and asterisk1/codecs/mp3/src/iwinQ.c are identical
Files asterisk/codecs/mp3/src/iwinbQ.c and asterisk1/codecs/mp3/src/iwinbQ.c are identical
Files asterisk/codecs/mp3/src/iwinm.c and asterisk1/codecs/mp3/src/iwinm.c are identical
Files asterisk/codecs/mp3/src/l3dq.c and asterisk1/codecs/mp3/src/l3dq.c are identical
Files asterisk/codecs/mp3/src/l3init.c and asterisk1/codecs/mp3/src/l3init.c are identical
Files asterisk/codecs/mp3/src/mdct.c and asterisk1/codecs/mp3/src/mdct.c are identical
Files asterisk/codecs/mp3/src/mhead.c and asterisk1/codecs/mp3/src/mhead.c are identical
Files asterisk/codecs/mp3/src/msis.c and asterisk1/codecs/mp3/src/msis.c are identical
Files asterisk/codecs/mp3/src/uph.c and asterisk1/codecs/mp3/src/uph.c are identical
Files asterisk/codecs/mp3/src/upsf.c and asterisk1/codecs/mp3/src/upsf.c are identical
Files asterisk/codecs/mp3/src/wavep.c and asterisk1/codecs/mp3/src/wavep.c are identical
Files asterisk/codecs/mp3/src/wcvt.c and asterisk1/codecs/mp3/src/wcvt.c are identical
Files asterisk/codecs/mp3/src/x86gas.s and asterisk1/codecs/mp3/src/x86gas.s are identical
Files asterisk/codecs/mp3/src/x86intel.c and asterisk1/codecs/mp3/src/x86intel.c are identical
Files asterisk/codecs/mp3_slin_ex.h and asterisk1/codecs/mp3_slin_ex.h are identical
Files asterisk/codecs/mp3anal.h and asterisk1/codecs/mp3anal.h are identical
Files asterisk/codecs/slin_adpcm_ex.h and asterisk1/codecs/slin_adpcm_ex.h are identical
Files asterisk/codecs/slin_g723_ex.h and asterisk1/codecs/slin_g723_ex.h are identical
Files asterisk/codecs/slin_gsm_ex.h and asterisk1/codecs/slin_gsm_ex.h are identical
Files asterisk/codecs/slin_ilbc_ex.h and asterisk1/codecs/slin_ilbc_ex.h are identical
Files asterisk/codecs/slin_lpc10_ex.h and asterisk1/codecs/slin_lpc10_ex.h are identical
Files asterisk/codecs/slin_speex_ex.h and asterisk1/codecs/slin_speex_ex.h are identical
Files asterisk/codecs/slin_ulaw_ex.h and asterisk1/codecs/slin_ulaw_ex.h are identical
Files asterisk/codecs/speex_slin_ex.h and asterisk1/codecs/speex_slin_ex.h are identical
Files asterisk/codecs/ulaw_slin_ex.h and asterisk1/codecs/ulaw_slin_ex.h are identical
Files asterisk/coef_in.h and asterisk1/coef_in.h are identical
Files asterisk/coef_out.h and asterisk1/coef_out.h are identical
Files asterisk/config.c and asterisk1/config.c are identical
Files asterisk/configs/CVS/Entries and asterisk1/configs/CVS/Entries are identical
Files asterisk/configs/CVS/Repository and asterisk1/configs/CVS/Repository are identical
Files asterisk/configs/CVS/Root and asterisk1/configs/CVS/Root are identical
Files asterisk/configs/adsi.conf.sample and asterisk1/configs/adsi.conf.sample are identical
Files asterisk/configs/adtranvofr.conf.sample and asterisk1/configs/adtranvofr.conf.sample are identical
Files asterisk/configs/agents.conf.sample and asterisk1/configs/agents.conf.sample are identical
Files asterisk/configs/alsa.conf.sample and asterisk1/configs/alsa.conf.sample are identical
Files asterisk/configs/asterisk.adsi and asterisk1/configs/asterisk.adsi are identical
Files asterisk/configs/enum.conf.sample and asterisk1/configs/enum.conf.sample are identical
Files asterisk/configs/extensions.conf.sample and asterisk1/configs/extensions.conf.sample are identical
Files asterisk/configs/festival.conf.sample and asterisk1/configs/festival.conf.sample are identical
Files asterisk/configs/iax.conf.sample and asterisk1/configs/iax.conf.sample are identical
Files asterisk/configs/indications.conf.sample and asterisk1/configs/indications.conf.sample are identical
Files asterisk/configs/logger.conf.sample and asterisk1/configs/logger.conf.sample are identical
Files asterisk/configs/manager.conf.sample and asterisk1/configs/manager.conf.sample are identical
Files asterisk/configs/meetme.conf.sample and asterisk1/configs/meetme.conf.sample are identical
Files asterisk/configs/mgcp.conf.sample and asterisk1/configs/mgcp.conf.sample are identical
Files asterisk/configs/modem.conf.sample and asterisk1/configs/modem.conf.sample are identical
Files asterisk/configs/modules.conf.sample and asterisk1/configs/modules.conf.sample are identical
Files asterisk/configs/musiconhold.conf.sample and asterisk1/configs/musiconhold.conf.sample are identical
Files asterisk/configs/oss.conf.sample and asterisk1/configs/oss.conf.sample are identical
Files asterisk/configs/parking.conf.sample and asterisk1/configs/parking.conf.sample are identical
Files asterisk/configs/phone.conf.sample and asterisk1/configs/phone.conf.sample are identical
Files asterisk/configs/privacy.conf.sample and asterisk1/configs/privacy.conf.sample are identical
Files asterisk/configs/queues.conf.sample and asterisk1/configs/queues.conf.sample are identical
Files asterisk/configs/rpt.conf.sample and asterisk1/configs/rpt.conf.sample are identical
Files asterisk/configs/rtp.conf.sample and asterisk1/configs/rtp.conf.sample are identical
Files asterisk/configs/sip.conf.sample and asterisk1/configs/sip.conf.sample are identical
Files asterisk/configs/skinny.conf.sample and asterisk1/configs/skinny.conf.sample are identical
Files asterisk/configs/telcordia-1.adsi and asterisk1/configs/telcordia-1.adsi are identical
Files asterisk/configs/voicemail.conf.sample and asterisk1/configs/voicemail.conf.sample are identical
Files asterisk/configs/vpb.conf.sample and asterisk1/configs/vpb.conf.sample are identical
Files asterisk/configs/zapata.conf.sample and asterisk1/configs/zapata.conf.sample are identical
Files asterisk/db.c and asterisk1/db.c are identical
Files asterisk/db1-ast/CVS/Entries and asterisk1/db1-ast/CVS/Entries are identical
Files asterisk/db1-ast/CVS/Repository and asterisk1/db1-ast/CVS/Repository are identical
Files asterisk/db1-ast/CVS/Root and asterisk1/db1-ast/CVS/Root are identical
Files asterisk/db1-ast/Makefile and asterisk1/db1-ast/Makefile are identical
Files asterisk/db1-ast/btree/CVS/Entries and asterisk1/db1-ast/btree/CVS/Entries are identical
Files asterisk/db1-ast/btree/CVS/Repository and asterisk1/db1-ast/btree/CVS/Repository are identical
Files asterisk/db1-ast/btree/CVS/Root and asterisk1/db1-ast/btree/CVS/Root are identical
Files asterisk/db1-ast/btree/bt_close.c and asterisk1/db1-ast/btree/bt_close.c are identical
Files asterisk/db1-ast/btree/bt_conv.c and asterisk1/db1-ast/btree/bt_conv.c are identical
Files asterisk/db1-ast/btree/bt_debug.c and asterisk1/db1-ast/btree/bt_debug.c are identical
Files asterisk/db1-ast/btree/bt_delete.c and asterisk1/db1-ast/btree/bt_delete.c are identical
Files asterisk/db1-ast/btree/bt_get.c and asterisk1/db1-ast/btree/bt_get.c are identical
Files asterisk/db1-ast/btree/bt_open.c and asterisk1/db1-ast/btree/bt_open.c are identical
Files asterisk/db1-ast/btree/bt_overflow.c and asterisk1/db1-ast/btree/bt_overflow.c are identical
Files asterisk/db1-ast/btree/bt_page.c and asterisk1/db1-ast/btree/bt_page.c are identical
Files asterisk/db1-ast/btree/bt_put.c and asterisk1/db1-ast/btree/bt_put.c are identical
Files asterisk/db1-ast/btree/bt_search.c and asterisk1/db1-ast/btree/bt_search.c are identical
Files asterisk/db1-ast/btree/bt_seq.c and asterisk1/db1-ast/btree/bt_seq.c are identical
Files asterisk/db1-ast/btree/bt_split.c and asterisk1/db1-ast/btree/bt_split.c are identical
Files asterisk/db1-ast/btree/bt_utils.c and asterisk1/db1-ast/btree/bt_utils.c are identical
Files asterisk/db1-ast/btree/btree.h and asterisk1/db1-ast/btree/btree.h are identical
Files asterisk/db1-ast/btree/extern.h and asterisk1/db1-ast/btree/extern.h are identical
Files asterisk/db1-ast/db/CVS/Entries and asterisk1/db1-ast/db/CVS/Entries are identical
Files asterisk/db1-ast/db/CVS/Repository and asterisk1/db1-ast/db/CVS/Repository are identical
Files asterisk/db1-ast/db/CVS/Root and asterisk1/db1-ast/db/CVS/Root are identical
Files asterisk/db1-ast/db/db.c and asterisk1/db1-ast/db/db.c are identical
Files asterisk/db1-ast/hash/CVS/Entries and asterisk1/db1-ast/hash/CVS/Entries are identical
Files asterisk/db1-ast/hash/CVS/Repository and asterisk1/db1-ast/hash/CVS/Repository are identical
Files asterisk/db1-ast/hash/CVS/Root and asterisk1/db1-ast/hash/CVS/Root are identical
Files asterisk/db1-ast/hash/README and asterisk1/db1-ast/hash/README are identical
Files asterisk/db1-ast/hash/extern.h and asterisk1/db1-ast/hash/extern.h are identical
Files asterisk/db1-ast/hash/hash.c and asterisk1/db1-ast/hash/hash.c are identical
Files asterisk/db1-ast/hash/hash.h and asterisk1/db1-ast/hash/hash.h are identical
Files asterisk/db1-ast/hash/hash_bigkey.c and asterisk1/db1-ast/hash/hash_bigkey.c are identical
Files asterisk/db1-ast/hash/hash_buf.c and asterisk1/db1-ast/hash/hash_buf.c are identical
Files asterisk/db1-ast/hash/hash_func.c and asterisk1/db1-ast/hash/hash_func.c are identical
Files asterisk/db1-ast/hash/hash_log2.c and asterisk1/db1-ast/hash/hash_log2.c are identical
Files asterisk/db1-ast/hash/hash_page.c and asterisk1/db1-ast/hash/hash_page.c are identical
Files asterisk/db1-ast/hash/hsearch.c and asterisk1/db1-ast/hash/hsearch.c are identical
Files asterisk/db1-ast/hash/ndbm.c and asterisk1/db1-ast/hash/ndbm.c are identical
Files asterisk/db1-ast/hash/page.h and asterisk1/db1-ast/hash/page.h are identical
Files asterisk/db1-ast/hash/search.h and asterisk1/db1-ast/hash/search.h are identical
Files asterisk/db1-ast/include/CVS/Entries and asterisk1/db1-ast/include/CVS/Entries are identical
Files asterisk/db1-ast/include/CVS/Repository and asterisk1/db1-ast/include/CVS/Repository are identical
Files asterisk/db1-ast/include/CVS/Root and asterisk1/db1-ast/include/CVS/Root are identical
Files asterisk/db1-ast/include/compat.h and asterisk1/db1-ast/include/compat.h are identical
Files asterisk/db1-ast/include/db.h and asterisk1/db1-ast/include/db.h are identical
diff -r -C3 -rcs asterisk/db1-ast/include/mpool.h asterisk1/db1-ast/include/mpool.h
*** asterisk/db1-ast/include/mpool.h	Sun Apr 27 14:13:11 2003
--- asterisk1/db1-ast/include/mpool.h	Thu Oct  2 19:58:05 2003
***************
*** 37,42 ****
--- 37,43 ----
  #define _MPOOL_H 1
  
  #include <sys/queue.h>
+ #include </usr/local/include/hqueue.h>
  
  /*
   * The memory pool scheme is a simple one.  Each in-memory page is referenced
Files asterisk/db1-ast/include/ndbm.h and asterisk1/db1-ast/include/ndbm.h are identical
Files asterisk/db1-ast/libdb.map and asterisk1/db1-ast/libdb.map are identical
Files asterisk/db1-ast/mpool/CVS/Entries and asterisk1/db1-ast/mpool/CVS/Entries are identical
Files asterisk/db1-ast/mpool/CVS/Repository and asterisk1/db1-ast/mpool/CVS/Repository are identical
Files asterisk/db1-ast/mpool/CVS/Root and asterisk1/db1-ast/mpool/CVS/Root are identical
Files asterisk/db1-ast/mpool/README and asterisk1/db1-ast/mpool/README are identical
diff -r -C3 -rcs asterisk/db1-ast/mpool/mpool.c asterisk1/db1-ast/mpool/mpool.c
*** asterisk/db1-ast/mpool/mpool.c	Wed Feb 12 08:59:15 2003
--- asterisk1/db1-ast/mpool/mpool.c	Thu Oct  2 20:00:51 2003
***************
*** 37,42 ****
--- 37,43 ----
  
  #include <sys/param.h>
  #include <sys/queue.h>
+ #include </usr/local/include/hqueue.h>
  #include <sys/stat.h>
  
  #include <errno.h>
Files asterisk/db1-ast/recno/CVS/Entries and asterisk1/db1-ast/recno/CVS/Entries are identical
Files asterisk/db1-ast/recno/CVS/Repository and asterisk1/db1-ast/recno/CVS/Repository are identical
Files asterisk/db1-ast/recno/CVS/Root and asterisk1/db1-ast/recno/CVS/Root are identical
Files asterisk/db1-ast/recno/extern.h and asterisk1/db1-ast/recno/extern.h are identical
Files asterisk/db1-ast/recno/rec_close.c and asterisk1/db1-ast/recno/rec_close.c are identical
Files asterisk/db1-ast/recno/rec_delete.c and asterisk1/db1-ast/recno/rec_delete.c are identical
Files asterisk/db1-ast/recno/rec_get.c and asterisk1/db1-ast/recno/rec_get.c are identical
Files asterisk/db1-ast/recno/rec_open.c and asterisk1/db1-ast/recno/rec_open.c are identical
Files asterisk/db1-ast/recno/rec_put.c and asterisk1/db1-ast/recno/rec_put.c are identical
Files asterisk/db1-ast/recno/rec_search.c and asterisk1/db1-ast/recno/rec_search.c are identical
Files asterisk/db1-ast/recno/rec_seq.c and asterisk1/db1-ast/recno/rec_seq.c are identical
Files asterisk/db1-ast/recno/rec_utils.c and asterisk1/db1-ast/recno/rec_utils.c are identical
Files asterisk/db1-ast/recno/recno.h and asterisk1/db1-ast/recno/recno.h are identical
Only in asterisk1: diff
Files asterisk/dns.c and asterisk1/dns.c are identical
Files asterisk/doc/CVS/Entries and asterisk1/doc/CVS/Entries are identical
Files asterisk/doc/CVS/Repository and asterisk1/doc/CVS/Repository are identical
Files asterisk/doc/CVS/Root and asterisk1/doc/CVS/Root are identical
Files asterisk/doc/apps.txt and asterisk1/doc/apps.txt are identical
Files asterisk/doc/channel.txt and asterisk1/doc/channel.txt are identical
Files asterisk/doc/extensions.txt and asterisk1/doc/extensions.txt are identical
Files asterisk/doc/iax.txt and asterisk1/doc/iax.txt are identical
Files asterisk/doc/linkedlists.README and asterisk1/doc/linkedlists.README are identical
Files asterisk/doc/manager.txt and asterisk1/doc/manager.txt are identical
Files asterisk/doc/model.txt and asterisk1/doc/model.txt are identical
Files asterisk/doc/modules.txt and asterisk1/doc/modules.txt are identical
Files asterisk/dsp.c and asterisk1/dsp.c are identical
Files asterisk/ecdisa.h and asterisk1/ecdisa.h are identical
Files asterisk/editline/.cvsignore and asterisk1/editline/.cvsignore are identical
Files asterisk/editline/CHANGES and asterisk1/editline/CHANGES are identical
Files asterisk/editline/CVS/Entries and asterisk1/editline/CVS/Entries are identical
Files asterisk/editline/CVS/Repository and asterisk1/editline/CVS/Repository are identical
Files asterisk/editline/CVS/Root and asterisk1/editline/CVS/Root are identical
Files asterisk/editline/INSTALL and asterisk1/editline/INSTALL are identical
Only in asterisk1/editline: Makefile
Files asterisk/editline/Makefile.in and asterisk1/editline/Makefile.in are identical
Files asterisk/editline/PLATFORMS and asterisk1/editline/PLATFORMS are identical
Files asterisk/editline/README and asterisk1/editline/README are identical
Files asterisk/editline/TEST/CVS/Entries and asterisk1/editline/TEST/CVS/Entries are identical
Files asterisk/editline/TEST/CVS/Repository and asterisk1/editline/TEST/CVS/Repository are identical
Files asterisk/editline/TEST/CVS/Root and asterisk1/editline/TEST/CVS/Root are identical
Files asterisk/editline/TEST/test.c and asterisk1/editline/TEST/test.c are identical
Files asterisk/editline/chared.c and asterisk1/editline/chared.c are identical
Files asterisk/editline/chared.h and asterisk1/editline/chared.h are identical
Files asterisk/editline/common.c and asterisk1/editline/common.c are identical
Only in asterisk1/editline: config.cache
Files asterisk/editline/config.guess and asterisk1/editline/config.guess are identical
Only in asterisk1/editline: config.h
Files asterisk/editline/config.h.in and asterisk1/editline/config.h.in are identical
Only in asterisk1/editline: config.log
Only in asterisk1/editline: config.status
Files asterisk/editline/config.sub and asterisk1/editline/config.sub are identical
Files asterisk/editline/configure and asterisk1/editline/configure are identical
Files asterisk/editline/configure.in and asterisk1/editline/configure.in are identical
Files asterisk/editline/editline.3 and asterisk1/editline/editline.3 are identical
Files asterisk/editline/editrc.5 and asterisk1/editline/editrc.5 are identical
Files asterisk/editline/el.c and asterisk1/editline/el.c are identical
Files asterisk/editline/el.h and asterisk1/editline/el.h are identical
Files asterisk/editline/emacs.c and asterisk1/editline/emacs.c are identical
Files asterisk/editline/hist.c and asterisk1/editline/hist.c are identical
Files asterisk/editline/hist.h and asterisk1/editline/hist.h are identical
Files asterisk/editline/histedit.h and asterisk1/editline/histedit.h are identical
Files asterisk/editline/history.c and asterisk1/editline/history.c are identical
Files asterisk/editline/install-sh and asterisk1/editline/install-sh are identical
Files asterisk/editline/key.c and asterisk1/editline/key.c are identical
Files asterisk/editline/key.h and asterisk1/editline/key.h are identical
Files asterisk/editline/makelist and asterisk1/editline/makelist are identical
Files asterisk/editline/map.c and asterisk1/editline/map.c are identical
Files asterisk/editline/map.h and asterisk1/editline/map.h are identical
Files asterisk/editline/np/.cvsignore and asterisk1/editline/np/.cvsignore are identical
Files asterisk/editline/np/CVS/Entries and asterisk1/editline/np/CVS/Entries are identical
Files asterisk/editline/np/CVS/Repository and asterisk1/editline/np/CVS/Repository are identical
Files asterisk/editline/np/CVS/Root and asterisk1/editline/np/CVS/Root are identical
Files asterisk/editline/np/fgetln.c and asterisk1/editline/np/fgetln.c are identical
Files asterisk/editline/np/strlcat.c and asterisk1/editline/np/strlcat.c are identical
Files asterisk/editline/np/strlcpy.c and asterisk1/editline/np/strlcpy.c are identical
Files asterisk/editline/np/unvis.c and asterisk1/editline/np/unvis.c are identical
Files asterisk/editline/np/vis.c and asterisk1/editline/np/vis.c are identical
Files asterisk/editline/np/vis.h and asterisk1/editline/np/vis.h are identical
Files asterisk/editline/parse.c and asterisk1/editline/parse.c are identical
Files asterisk/editline/parse.h and asterisk1/editline/parse.h are identical
Files asterisk/editline/prompt.c and asterisk1/editline/prompt.c are identical
Files asterisk/editline/prompt.h and asterisk1/editline/prompt.h are identical
Files asterisk/editline/read.c and asterisk1/editline/read.c are identical
Files asterisk/editline/read.h and asterisk1/editline/read.h are identical
Files asterisk/editline/readline/CVS/Entries and asterisk1/editline/readline/CVS/Entries are identical
Files asterisk/editline/readline/CVS/Repository and asterisk1/editline/readline/CVS/Repository are identical
Files asterisk/editline/readline/CVS/Root and asterisk1/editline/readline/CVS/Root are identical
Files asterisk/editline/readline/readline.h and asterisk1/editline/readline/readline.h are identical
Files asterisk/editline/readline.c and asterisk1/editline/readline.c are identical
Files asterisk/editline/refresh.c and asterisk1/editline/refresh.c are identical
Files asterisk/editline/refresh.h and asterisk1/editline/refresh.h are identical
Files asterisk/editline/search.c and asterisk1/editline/search.c are identical
Files asterisk/editline/search.h and asterisk1/editline/search.h are identical
Files asterisk/editline/sig.c and asterisk1/editline/sig.c are identical
Files asterisk/editline/sig.h and asterisk1/editline/sig.h are identical
Files asterisk/editline/sys.h and asterisk1/editline/sys.h are identical
Files asterisk/editline/term.c and asterisk1/editline/term.c are identical
Files asterisk/editline/term.h and asterisk1/editline/term.h are identical
Files asterisk/editline/tokenizer.c and asterisk1/editline/tokenizer.c are identical
Files asterisk/editline/tokenizer.h and asterisk1/editline/tokenizer.h are identical
Files asterisk/editline/tty.c and asterisk1/editline/tty.c are identical
Files asterisk/editline/tty.h and asterisk1/editline/tty.h are identical
Files asterisk/editline/vi.c and asterisk1/editline/vi.c are identical
Files asterisk/enum.c and asterisk1/enum.c are identical
Only in asterisk1: enum.c.orig
Only in asterisk1: enum.c.rej
Only in asterisk1: enum.c.rej.orig
Files asterisk/festival-1.4.1-diff and asterisk1/festival-1.4.1-diff are identical
Files asterisk/festival-1.4.2.diff and asterisk1/festival-1.4.2.diff are identical
Files asterisk/festival-1.4.3.diff and asterisk1/festival-1.4.3.diff are identical
Files asterisk/file.c and asterisk1/file.c are identical
Files asterisk/formats/.cvsignore and asterisk1/formats/.cvsignore are identical
diff -r -C3 -rcs asterisk/formats/CVS/Entries asterisk1/formats/CVS/Entries
*** asterisk/formats/CVS/Entries	Fri Oct  3 13:41:34 2003
--- asterisk1/formats/CVS/Entries	Thu Oct  2 18:21:45 2003
***************
*** 8,14 ****
  /format_mp3.c/1.5/Mon Sep  8 16:48:07 2003//
  /format_pcm.c/1.7/Mon Sep  8 16:48:07 2003//
  /format_pcm_alaw.c/1.8/Mon Sep  8 16:48:07 2003//
! /format_vox.c/1.8/Thu Oct  2 23:17:32 2003//
  /format_wav.c/1.7/Mon Sep  8 16:48:07 2003//
  /format_wav_gsm.c/1.7/Mon Sep  8 16:48:07 2003//
  /msgsm.h/1.1.1.2/Fri Mar  7 06:00:13 2003//
--- 8,14 ----
  /format_mp3.c/1.5/Mon Sep  8 16:48:07 2003//
  /format_pcm.c/1.7/Mon Sep  8 16:48:07 2003//
  /format_pcm_alaw.c/1.8/Mon Sep  8 16:48:07 2003//
! /format_vox.c/1.7/Sun Sep 21 02:59:26 2003//
  /format_wav.c/1.7/Mon Sep  8 16:48:07 2003//
  /format_wav_gsm.c/1.7/Mon Sep  8 16:48:07 2003//
  /msgsm.h/1.1.1.2/Fri Mar  7 06:00:13 2003//
Files asterisk/formats/CVS/Repository and asterisk1/formats/CVS/Repository are identical
Files asterisk/formats/CVS/Root and asterisk1/formats/CVS/Root are identical
Files asterisk/formats/Makefile and asterisk1/formats/Makefile are identical
Files asterisk/formats/format_g723.c and asterisk1/formats/format_g723.c are identical
Files asterisk/formats/format_g729.c and asterisk1/formats/format_g729.c are identical
Files asterisk/formats/format_gsm.c and asterisk1/formats/format_gsm.c are identical
Files asterisk/formats/format_h263.c and asterisk1/formats/format_h263.c are identical
Files asterisk/formats/format_jpeg.c and asterisk1/formats/format_jpeg.c are identical
Files asterisk/formats/format_mp3.c and asterisk1/formats/format_mp3.c are identical
Files asterisk/formats/format_pcm.c and asterisk1/formats/format_pcm.c are identical
Files asterisk/formats/format_pcm_alaw.c and asterisk1/formats/format_pcm_alaw.c are identical
diff -r -C3 -rcs asterisk/formats/format_vox.c asterisk1/formats/format_vox.c
*** asterisk/formats/format_vox.c	Thu Oct  2 19:17:32 2003
--- asterisk1/formats/format_vox.c	Sat Sep 20 22:59:26 2003
***************
*** 33,39 ****
  #endif
  
  #define BUF_SIZE 80		/* 160 samples */
- #define BUF_SHIFT	5
  
  struct ast_filestream {
  	void *reserved[AST_RESERVED_POINTERS];
--- 33,38 ----
***************
*** 42,54 ****
  	struct ast_frame fr;				/* Frame information */
  	char waste[AST_FRIENDLY_OFFSET];	/* Buffer for sending frames, etc */
  	char empty;							/* Empty character */
! 	unsigned char buf[BUF_SIZE + BUF_SHIFT];	/* Output Buffer */
  	int lasttimeout;
  	struct timeval last;
  	short signal;						/* Signal level (file side) */
  	short ssindex;						/* Signal ssindex (file side) */
- 	unsigned char zero_count;				/* counter of consecutive zero samples */
- 	unsigned char next_flag;
  };
  
  
--- 41,51 ----
  	struct ast_frame fr;				/* Frame information */
  	char waste[AST_FRIENDLY_OFFSET];	/* Buffer for sending frames, etc */
  	char empty;							/* Empty character */
! 	unsigned char buf[BUF_SIZE + 3];				/* Output Buffer */
  	int lasttimeout;
  	struct timeval last;
  	short signal;						/* Signal level (file side) */
  	short ssindex;						/* Signal ssindex (file side) */
  };
  
  
***************
*** 98,145 ****
   *  Sets the index to the step size table for the next encode.
   */
  
! static inline void 
! decode (unsigned char encoded, short *ssindex, short *signal, unsigned char *rkey, unsigned char *next)
  {
    short diff, step;
    step = stpsz[*ssindex];
! 
!   diff = step * nbl2bit[encoded][1] +
! 		(step >> 1) * nbl2bit[encoded][2] +
! 		(step >> 2) * nbl2bit[encoded][3] +
! 		(step >> 3);
!   if (nbl2bit[encoded][2] && (step & 0x1))
! 	diff++;
!   diff *= nbl2bit[encoded][0];
! 
!   if ( *next & 0x1 )
!         *signal -= 8;
!   else if ( *next & 0x2 )
!         *signal += 8;
! 
!   *signal += diff;
! 
!   if (*signal > 2047)
! 	*signal = 2047;
!   else if (*signal < -2047)
! 	*signal = -2047;
! 
!   *next = 0;
!   if( encoded & 0x7 )
!         *rkey = 0;
!   else if ( ++(*rkey) == 24 ) {
! 	*rkey = 0;
! 	if (*signal > 0)
! 		*next = 0x1;
! 	else if (*signal < 0)
! 		*next = 0x2;
!   }
! 
    *ssindex = *ssindex + indsft[(encoded & 7)];
    if (*ssindex < 0)
      *ssindex = 0;
    else if (*ssindex > 48)
      *ssindex = 48;
  }
  
  /*
--- 95,115 ----
   *  Sets the index to the step size table for the next encode.
   */
  
! static inline short
! decode (unsigned char encoded, short *ssindex)
  {
    short diff, step;
    step = stpsz[*ssindex];
!   diff = nbl2bit[encoded][0] * (step * nbl2bit[encoded][1] +
! 				(step >> 1) * nbl2bit[encoded][2] +
! 				(step >> 2) * nbl2bit[encoded][3] +
! 				(step >> 3));
    *ssindex = *ssindex + indsft[(encoded & 7)];
    if (*ssindex < 0)
      *ssindex = 0;
    else if (*ssindex > 48)
      *ssindex = 48;
+   return (diff);
  }
  
  /*
***************
*** 159,165 ****
  {
    short diff, step;
    unsigned char encoded;
-   unsigned char zero_count, next_flag;
    step = stpsz[*ssindex];
    /* 
     * Clip csig if too large or too small
--- 129,134 ----
***************
*** 191,198 ****
    if (diff >= step)
      encoded |= 1;
      
!   decode (encoded, ssindex, signal, &zero_count, &next_flag);
! 
    return (encoded);
  }
  
--- 160,166 ----
    if (diff >= step)
      encoded |= 1;
      
!   *signal += decode (encoded, ssindex);
    return (encoded);
  }
  
***************
*** 265,276 ****
  	int res;
  	int x;
  	/* Send a frame from the file to the appropriate channel */
  	s->fr.frametype = AST_FRAME_VOICE;
  	s->fr.subclass = AST_FORMAT_ADPCM;
  	s->fr.offset = AST_FRIENDLY_OFFSET;
  	s->fr.mallocd = 0;
  	s->fr.data = s->buf;
! 	if ((res = read(s->fd, s->buf + BUF_SHIFT, BUF_SIZE)) < 1) {
  		if (res)
  			ast_log(LOG_WARNING, "Short read (%d) (%s)!\n", res, strerror(errno));
  		return NULL;
--- 233,245 ----
  	int res;
  	int x;
  	/* Send a frame from the file to the appropriate channel */
+ 
  	s->fr.frametype = AST_FRAME_VOICE;
  	s->fr.subclass = AST_FORMAT_ADPCM;
  	s->fr.offset = AST_FRIENDLY_OFFSET;
  	s->fr.mallocd = 0;
  	s->fr.data = s->buf;
! 	if ((res = read(s->fd, s->buf + 3, BUF_SIZE)) < 1) {
  		if (res)
  			ast_log(LOG_WARNING, "Short read (%d) (%s)!\n", res, strerror(errno));
  		return NULL;
***************
*** 279,293 ****
  	s->buf[0] = s->ssindex & 0xff;
  	s->buf[1] = (s->signal >> 8) & 0xff;
  	s->buf[2] = s->signal & 0xff;
- 	s->buf[3] = s->zero_count;
- 	s->buf[4] = s->next_flag;
  	/* Do the decoder to be sure we get the right stuff in the signal and index fields. */
! 	for (x=BUF_SHIFT;x<res+BUF_SHIFT;x++) {
! 		decode (s->buf[x] >> 4, &s->ssindex, &s->signal, &s->zero_count, &s->next_flag);
! 		decode (s->buf[x] & 0xf, &s->ssindex, &s->signal, &s->zero_count, &s->next_flag);
  	}
  	s->fr.samples = res * 2;
! 	s->fr.datalen = res + BUF_SHIFT;
  	*whennext = s->fr.samples;
  	return &s->fr;
  }
--- 248,260 ----
  	s->buf[0] = s->ssindex & 0xff;
  	s->buf[1] = (s->signal >> 8) & 0xff;
  	s->buf[2] = s->signal & 0xff;
  	/* Do the decoder to be sure we get the right stuff in the signal and index fields. */
! 	for (x=3;x<res+3;x++) {
! 		s->signal += decode(s->buf[x] >> 4, &s->ssindex);
! 		s->signal += decode(s->buf[x] & 0xf, &s->ssindex);
  	}
  	s->fr.samples = res * 2;
! 	s->fr.datalen = res + 3;
  	*whennext = s->fr.samples;
  	return &s->fr;
  }
***************
*** 303,313 ****
  		ast_log(LOG_WARNING, "Asked to write non-ADPCM frame (%d)!\n", f->subclass);
  		return -1;
  	}
! 	if (f->datalen < BUF_SHIFT) {
! 		ast_log(LOG_WARNING, "Invalid frame of data (< %d bytes long) from %s\n", BUF_SHIFT, f->src);
  		return -1;
  	}
! 	if ((res = write(fs->fd, f->data + BUF_SHIFT, f->datalen - BUF_SHIFT)) != f->datalen - BUF_SHIFT) {
  			ast_log(LOG_WARNING, "Bad write (%d/%d): %s\n", res, f->datalen, strerror(errno));
  			return -1;
  	}
--- 270,280 ----
  		ast_log(LOG_WARNING, "Asked to write non-ADPCM frame (%d)!\n", f->subclass);
  		return -1;
  	}
! 	if (f->datalen < 3) {
! 		ast_log(LOG_WARNING, "Invalid frame of data (< 3 bytes long) from %s\n", f->src);
  		return -1;
  	}
! 	if ((res = write(fs->fd, f->data + 3, f->datalen - 3)) != f->datalen - 3) {
  			ast_log(LOG_WARNING, "Bad write (%d/%d): %s\n", res, f->datalen, strerror(errno));
  			return -1;
  	}
Files asterisk/formats/format_wav.c and asterisk1/formats/format_wav.c are identical
Files asterisk/formats/format_wav_gsm.c and asterisk1/formats/format_wav_gsm.c are identical
Files asterisk/formats/msgsm.h and asterisk1/formats/msgsm.h are identical
Files asterisk/frame.c and asterisk1/frame.c are identical
Files asterisk/fskmodem.c and asterisk1/fskmodem.c are identical
Files asterisk/image.c and asterisk1/image.c are identical
Files asterisk/images/CVS/Entries and asterisk1/images/CVS/Entries are identical
Files asterisk/images/CVS/Repository and asterisk1/images/CVS/Repository are identical
Files asterisk/images/CVS/Root and asterisk1/images/CVS/Root are identical
Files asterisk/images/animlogo.gif and asterisk1/images/animlogo.gif are identical
Files asterisk/images/asterisk-intro.jpg and asterisk1/images/asterisk-intro.jpg are identical
Files asterisk/images/play.gif and asterisk1/images/play.gif are identical
Files asterisk/include/CVS/Entries and asterisk1/include/CVS/Entries are identical
Files asterisk/include/CVS/Repository and asterisk1/include/CVS/Repository are identical
Files asterisk/include/CVS/Root and asterisk1/include/CVS/Root are identical
Files asterisk/include/asterisk/CVS/Entries and asterisk1/include/asterisk/CVS/Entries are identical
Files asterisk/include/asterisk/CVS/Repository and asterisk1/include/asterisk/CVS/Repository are identical
Files asterisk/include/asterisk/CVS/Root and asterisk1/include/asterisk/CVS/Root are identical
Files asterisk/include/asterisk/acl.h and asterisk1/include/asterisk/acl.h are identical
Files asterisk/include/asterisk/adsi.h and asterisk1/include/asterisk/adsi.h are identical
Files asterisk/include/asterisk/alaw.h and asterisk1/include/asterisk/alaw.h are identical
Files asterisk/include/asterisk/app.h and asterisk1/include/asterisk/app.h are identical
Files asterisk/include/asterisk/ast_expr.h and asterisk1/include/asterisk/ast_expr.h are identical
Files asterisk/include/asterisk/astdb.h and asterisk1/include/asterisk/astdb.h are identical
Files asterisk/include/asterisk/astmm.h and asterisk1/include/asterisk/astmm.h are identical
Files asterisk/include/asterisk/callerid.h and asterisk1/include/asterisk/callerid.h are identical
Files asterisk/include/asterisk/causes.h and asterisk1/include/asterisk/causes.h are identical
Files asterisk/include/asterisk/cdr.h and asterisk1/include/asterisk/cdr.h are identical
Files asterisk/include/asterisk/channel.h and asterisk1/include/asterisk/channel.h are identical
Files asterisk/include/asterisk/channel_pvt.h and asterisk1/include/asterisk/channel_pvt.h are identical
Files asterisk/include/asterisk/chanvars.h and asterisk1/include/asterisk/chanvars.h are identical
Files asterisk/include/asterisk/cli.h and asterisk1/include/asterisk/cli.h are identical
Files asterisk/include/asterisk/config.h and asterisk1/include/asterisk/config.h are identical
Files asterisk/include/asterisk/crypto.h and asterisk1/include/asterisk/crypto.h are identical
Files asterisk/include/asterisk/dns.h and asterisk1/include/asterisk/dns.h are identical
Files asterisk/include/asterisk/dsp.h and asterisk1/include/asterisk/dsp.h are identical
Files asterisk/include/asterisk/enum.h and asterisk1/include/asterisk/enum.h are identical
Files asterisk/include/asterisk/file.h and asterisk1/include/asterisk/file.h are identical
Files asterisk/include/asterisk/frame.h and asterisk1/include/asterisk/frame.h are identical
Files asterisk/include/asterisk/fskmodem.h and asterisk1/include/asterisk/fskmodem.h are identical
Files asterisk/include/asterisk/image.h and asterisk1/include/asterisk/image.h are identical
Files asterisk/include/asterisk/indications.h and asterisk1/include/asterisk/indications.h are identical
Files asterisk/include/asterisk/io.h and asterisk1/include/asterisk/io.h are identical
Files asterisk/include/asterisk/linkedlists.h and asterisk1/include/asterisk/linkedlists.h are identical
Files asterisk/include/asterisk/localtime.h and asterisk1/include/asterisk/localtime.h are identical
Files asterisk/include/asterisk/lock.h and asterisk1/include/asterisk/lock.h are identical
Files asterisk/include/asterisk/logger.h and asterisk1/include/asterisk/logger.h are identical
Files asterisk/include/asterisk/manager.h and asterisk1/include/asterisk/manager.h are identical
Files asterisk/include/asterisk/md5.h and asterisk1/include/asterisk/md5.h are identical
Files asterisk/include/asterisk/module.h and asterisk1/include/asterisk/module.h are identical
Files asterisk/include/asterisk/monitor.h and asterisk1/include/asterisk/monitor.h are identical
Files asterisk/include/asterisk/musiconhold.h and asterisk1/include/asterisk/musiconhold.h are identical
Files asterisk/include/asterisk/options.h and asterisk1/include/asterisk/options.h are identical
Files asterisk/include/asterisk/parking.h and asterisk1/include/asterisk/parking.h are identical
Files asterisk/include/asterisk/pbx.h and asterisk1/include/asterisk/pbx.h are identical
Files asterisk/include/asterisk/privacy.h and asterisk1/include/asterisk/privacy.h are identical
Files asterisk/include/asterisk/rtp.h and asterisk1/include/asterisk/rtp.h are identical
Files asterisk/include/asterisk/say.h and asterisk1/include/asterisk/say.h are identical
Files asterisk/include/asterisk/sched.h and asterisk1/include/asterisk/sched.h are identical
Files asterisk/include/asterisk/srv.h and asterisk1/include/asterisk/srv.h are identical
Files asterisk/include/asterisk/tdd.h and asterisk1/include/asterisk/tdd.h are identical
Files asterisk/include/asterisk/term.h and asterisk1/include/asterisk/term.h are identical
Files asterisk/include/asterisk/translate.h and asterisk1/include/asterisk/translate.h are identical
Files asterisk/include/asterisk/ulaw.h and asterisk1/include/asterisk/ulaw.h are identical
Files asterisk/include/asterisk/vmodem.h and asterisk1/include/asterisk/vmodem.h are identical
Files asterisk/indications.c and asterisk1/indications.c are identical
Files asterisk/init.asterisk and asterisk1/init.asterisk are identical
Files asterisk/io.c and asterisk1/io.c are identical
Files asterisk/keys/CVS/Entries and asterisk1/keys/CVS/Entries are identical
Files asterisk/keys/CVS/Repository and asterisk1/keys/CVS/Repository are identical
Files asterisk/keys/CVS/Root and asterisk1/keys/CVS/Root are identical
Files asterisk/keys/iaxtel.pub and asterisk1/keys/iaxtel.pub are identical
Files asterisk/loader.c and asterisk1/loader.c are identical
Files asterisk/logger.c and asterisk1/logger.c are identical
Files asterisk/make_build_h and asterisk1/make_build_h are identical
Files asterisk/manager.c and asterisk1/manager.c are identical
Files asterisk/md5.c and asterisk1/md5.c are identical
Files asterisk/mkdep and asterisk1/mkdep are identical
Files asterisk/pbx/.cvsignore and asterisk1/pbx/.cvsignore are identical
Files asterisk/pbx/CVS/Entries and asterisk1/pbx/CVS/Entries are identical
Files asterisk/pbx/CVS/Repository and asterisk1/pbx/CVS/Repository are identical
Files asterisk/pbx/CVS/Root and asterisk1/pbx/CVS/Root are identical
Files asterisk/pbx/Makefile and asterisk1/pbx/Makefile are identical
Files asterisk/pbx/pbx_config.c and asterisk1/pbx/pbx_config.c are identical
Files asterisk/pbx/pbx_gtkconsole.c and asterisk1/pbx/pbx_gtkconsole.c are identical
Files asterisk/pbx/pbx_kdeconsole.cc and asterisk1/pbx/pbx_kdeconsole.cc are identical
Files asterisk/pbx/pbx_kdeconsole.h and asterisk1/pbx/pbx_kdeconsole.h are identical
Files asterisk/pbx/pbx_kdeconsole_main.cc and asterisk1/pbx/pbx_kdeconsole_main.cc are identical
Files asterisk/pbx/pbx_spool.c and asterisk1/pbx/pbx_spool.c are identical
Files asterisk/pbx/pbx_wilcalu.c and asterisk1/pbx/pbx_wilcalu.c are identical
Files asterisk/pbx.c and asterisk1/pbx.c are identical
Files asterisk/privacy.c and asterisk1/privacy.c are identical
Files asterisk/redhat/CVS/Entries and asterisk1/redhat/CVS/Entries are identical
Files asterisk/redhat/CVS/Repository and asterisk1/redhat/CVS/Repository are identical
Files asterisk/redhat/CVS/Root and asterisk1/redhat/CVS/Root are identical
Files asterisk/redhat/asterisk and asterisk1/redhat/asterisk are identical
Files asterisk/redhat/asterisk.spec and asterisk1/redhat/asterisk.spec are identical
Files asterisk/redhat/rpmmacros and asterisk1/redhat/rpmmacros are identical
Files asterisk/redhat/rpmrc and asterisk1/redhat/rpmrc are identical
Files asterisk/res/.cvsignore and asterisk1/res/.cvsignore are identical
Files asterisk/res/CVS/Entries and asterisk1/res/CVS/Entries are identical
Files asterisk/res/CVS/Repository and asterisk1/res/CVS/Repository are identical
Files asterisk/res/CVS/Root and asterisk1/res/CVS/Root are identical
Files asterisk/res/Makefile and asterisk1/res/Makefile are identical
Files asterisk/res/res_adsi.c and asterisk1/res/res_adsi.c are identical
Files asterisk/res/res_crypto.c and asterisk1/res/res_crypto.c are identical
Files asterisk/res/res_indications.c and asterisk1/res/res_indications.c are identical
Files asterisk/res/res_monitor.c and asterisk1/res/res_monitor.c are identical
Files asterisk/res/res_musiconhold.c and asterisk1/res/res_musiconhold.c are identical
Only in asterisk1/res: res_musiconhold.c.orig
Only in asterisk1/res: res_musiconhold.c.rej
Files asterisk/res/res_parking.c and asterisk1/res/res_parking.c are identical
Files asterisk/retrieve_extensions_from_mysql.pl and asterisk1/retrieve_extensions_from_mysql.pl are identical
Files asterisk/retrieve_sip_conf_from_mysql.pl and asterisk1/retrieve_sip_conf_from_mysql.pl are identical
Files asterisk/rtp.c and asterisk1/rtp.c are identical
Files asterisk/safe_asterisk and asterisk1/safe_asterisk are identical
Files asterisk/sample.call and asterisk1/sample.call are identical
Files asterisk/say.c and asterisk1/say.c are identical
Files asterisk/sched.c and asterisk1/sched.c are identical
Files asterisk/sounds/CVS/Entries and asterisk1/sounds/CVS/Entries are identical
Files asterisk/sounds/CVS/Repository and asterisk1/sounds/CVS/Repository are identical
Files asterisk/sounds/CVS/Root and asterisk1/sounds/CVS/Root are identical
Files asterisk/sounds/agent-alreadyon.gsm and asterisk1/sounds/agent-alreadyon.gsm are identical
Files asterisk/sounds/agent-incorrect.gsm and asterisk1/sounds/agent-incorrect.gsm are identical
Files asterisk/sounds/agent-loggedoff.gsm and asterisk1/sounds/agent-loggedoff.gsm are identical
Files asterisk/sounds/agent-loginok.gsm and asterisk1/sounds/agent-loginok.gsm are identical
Files asterisk/sounds/agent-newlocation.gsm and asterisk1/sounds/agent-newlocation.gsm are identical
Files asterisk/sounds/agent-pass.gsm and asterisk1/sounds/agent-pass.gsm are identical
Files asterisk/sounds/agent-user.gsm and asterisk1/sounds/agent-user.gsm are identical
Files asterisk/sounds/auth-incorrect.gsm and asterisk1/sounds/auth-incorrect.gsm are identical
Files asterisk/sounds/auth-thankyou.gsm and asterisk1/sounds/auth-thankyou.gsm are identical
Files asterisk/sounds/beep.gsm and asterisk1/sounds/beep.gsm are identical
Files asterisk/sounds/conf-getchannel.gsm and asterisk1/sounds/conf-getchannel.gsm are identical
Files asterisk/sounds/conf-getconfno.gsm and asterisk1/sounds/conf-getconfno.gsm are identical
Files asterisk/sounds/conf-invalid.gsm and asterisk1/sounds/conf-invalid.gsm are identical
Files asterisk/sounds/conf-onlyperson.gsm and asterisk1/sounds/conf-onlyperson.gsm are identical
Files asterisk/sounds/demo-abouttotry.gsm and asterisk1/sounds/demo-abouttotry.gsm are identical
Files asterisk/sounds/demo-congrats.gsm and asterisk1/sounds/demo-congrats.gsm are identical
Files asterisk/sounds/demo-echodone.gsm and asterisk1/sounds/demo-echodone.gsm are identical
Files asterisk/sounds/demo-echotest.gsm and asterisk1/sounds/demo-echotest.gsm are identical
Files asterisk/sounds/demo-enterkeywords.gsm and asterisk1/sounds/demo-enterkeywords.gsm are identical
Files asterisk/sounds/demo-instruct.gsm and asterisk1/sounds/demo-instruct.gsm are identical
Files asterisk/sounds/demo-moreinfo.gsm and asterisk1/sounds/demo-moreinfo.gsm are identical
Files asterisk/sounds/demo-nogo.gsm and asterisk1/sounds/demo-nogo.gsm are identical
Files asterisk/sounds/demo-nomatch.gsm and asterisk1/sounds/demo-nomatch.gsm are identical
Files asterisk/sounds/demo-thanks.gsm and asterisk1/sounds/demo-thanks.gsm are identical
Files asterisk/sounds/digits/0.gsm and asterisk1/sounds/digits/0.gsm are identical
Files asterisk/sounds/digits/1.gsm and asterisk1/sounds/digits/1.gsm are identical
Files asterisk/sounds/digits/10.gsm and asterisk1/sounds/digits/10.gsm are identical
Files asterisk/sounds/digits/11.gsm and asterisk1/sounds/digits/11.gsm are identical
Files asterisk/sounds/digits/12.gsm and asterisk1/sounds/digits/12.gsm are identical
Files asterisk/sounds/digits/13.gsm and asterisk1/sounds/digits/13.gsm are identical
Files asterisk/sounds/digits/14.gsm and asterisk1/sounds/digits/14.gsm are identical
Files asterisk/sounds/digits/15.gsm and asterisk1/sounds/digits/15.gsm are identical
Files asterisk/sounds/digits/16.gsm and asterisk1/sounds/digits/16.gsm are identical
Files asterisk/sounds/digits/17.gsm and asterisk1/sounds/digits/17.gsm are identical
Files asterisk/sounds/digits/18.gsm and asterisk1/sounds/digits/18.gsm are identical
Files asterisk/sounds/digits/19.gsm and asterisk1/sounds/digits/19.gsm are identical
Files asterisk/sounds/digits/2.gsm and asterisk1/sounds/digits/2.gsm are identical
Files asterisk/sounds/digits/20.gsm and asterisk1/sounds/digits/20.gsm are identical
Files asterisk/sounds/digits/3.gsm and asterisk1/sounds/digits/3.gsm are identical
Files asterisk/sounds/digits/30.gsm and asterisk1/sounds/digits/30.gsm are identical
Files asterisk/sounds/digits/4.gsm and asterisk1/sounds/digits/4.gsm are identical
Files asterisk/sounds/digits/40.gsm and asterisk1/sounds/digits/40.gsm are identical
Files asterisk/sounds/digits/5.gsm and asterisk1/sounds/digits/5.gsm are identical
Files asterisk/sounds/digits/50.gsm and asterisk1/sounds/digits/50.gsm are identical
Files asterisk/sounds/digits/6.gsm and asterisk1/sounds/digits/6.gsm are identical
Files asterisk/sounds/digits/60.gsm and asterisk1/sounds/digits/60.gsm are identical
Files asterisk/sounds/digits/7.gsm and asterisk1/sounds/digits/7.gsm are identical
Files asterisk/sounds/digits/70.gsm and asterisk1/sounds/digits/70.gsm are identical
Files asterisk/sounds/digits/8.gsm and asterisk1/sounds/digits/8.gsm are identical
Files asterisk/sounds/digits/80.gsm and asterisk1/sounds/digits/80.gsm are identical
Files asterisk/sounds/digits/9.gsm and asterisk1/sounds/digits/9.gsm are identical
Files asterisk/sounds/digits/90.gsm and asterisk1/sounds/digits/90.gsm are identical
Files asterisk/sounds/digits/CVS/Entries and asterisk1/sounds/digits/CVS/Entries are identical
Files asterisk/sounds/digits/CVS/Repository and asterisk1/sounds/digits/CVS/Repository are identical
Files asterisk/sounds/digits/CVS/Root and asterisk1/sounds/digits/CVS/Root are identical
Files asterisk/sounds/digits/a-m.gsm and asterisk1/sounds/digits/a-m.gsm are identical
Files asterisk/sounds/digits/at.gsm and asterisk1/sounds/digits/at.gsm are identical
Files asterisk/sounds/digits/day-0.gsm and asterisk1/sounds/digits/day-0.gsm are identical
Files asterisk/sounds/digits/day-1.gsm and asterisk1/sounds/digits/day-1.gsm are identical
Files asterisk/sounds/digits/day-2.gsm and asterisk1/sounds/digits/day-2.gsm are identical
Files asterisk/sounds/digits/day-3.gsm and asterisk1/sounds/digits/day-3.gsm are identical
Files asterisk/sounds/digits/day-4.gsm and asterisk1/sounds/digits/day-4.gsm are identical
Files asterisk/sounds/digits/day-5.gsm and asterisk1/sounds/digits/day-5.gsm are identical
Files asterisk/sounds/digits/day-6.gsm and asterisk1/sounds/digits/day-6.gsm are identical
Files asterisk/sounds/digits/dollars.gsm and asterisk1/sounds/digits/dollars.gsm are identical
Files asterisk/sounds/digits/h-1.gsm and asterisk1/sounds/digits/h-1.gsm are identical
Files asterisk/sounds/digits/h-10.gsm and asterisk1/sounds/digits/h-10.gsm are identical
Files asterisk/sounds/digits/h-11.gsm and asterisk1/sounds/digits/h-11.gsm are identical
Files asterisk/sounds/digits/h-12.gsm and asterisk1/sounds/digits/h-12.gsm are identical
Files asterisk/sounds/digits/h-13.gsm and asterisk1/sounds/digits/h-13.gsm are identical
Files asterisk/sounds/digits/h-14.gsm and asterisk1/sounds/digits/h-14.gsm are identical
Files asterisk/sounds/digits/h-15.gsm and asterisk1/sounds/digits/h-15.gsm are identical
Files asterisk/sounds/digits/h-16.gsm and asterisk1/sounds/digits/h-16.gsm are identical
Files asterisk/sounds/digits/h-17.gsm and asterisk1/sounds/digits/h-17.gsm are identical
Files asterisk/sounds/digits/h-18.gsm and asterisk1/sounds/digits/h-18.gsm are identical
Files asterisk/sounds/digits/h-19.gsm and asterisk1/sounds/digits/h-19.gsm are identical
Files asterisk/sounds/digits/h-2.gsm and asterisk1/sounds/digits/h-2.gsm are identical
Files asterisk/sounds/digits/h-20.gsm and asterisk1/sounds/digits/h-20.gsm are identical
Files asterisk/sounds/digits/h-3.gsm and asterisk1/sounds/digits/h-3.gsm are identical
Files asterisk/sounds/digits/h-30.gsm and asterisk1/sounds/digits/h-30.gsm are identical
Files asterisk/sounds/digits/h-4.gsm and asterisk1/sounds/digits/h-4.gsm are identical
Files asterisk/sounds/digits/h-5.gsm and asterisk1/sounds/digits/h-5.gsm are identical
Files asterisk/sounds/digits/h-6.gsm and asterisk1/sounds/digits/h-6.gsm are identical
Files asterisk/sounds/digits/h-7.gsm and asterisk1/sounds/digits/h-7.gsm are identical
Files asterisk/sounds/digits/h-8.gsm and asterisk1/sounds/digits/h-8.gsm are identical
Files asterisk/sounds/digits/h-9.gsm and asterisk1/sounds/digits/h-9.gsm are identical
Files asterisk/sounds/digits/hundred.gsm and asterisk1/sounds/digits/hundred.gsm are identical
Files asterisk/sounds/digits/million.gsm and asterisk1/sounds/digits/million.gsm are identical
Files asterisk/sounds/digits/mon-0.gsm and asterisk1/sounds/digits/mon-0.gsm are identical
Files asterisk/sounds/digits/mon-1.gsm and asterisk1/sounds/digits/mon-1.gsm are identical
Files asterisk/sounds/digits/mon-10.gsm and asterisk1/sounds/digits/mon-10.gsm are identical
Files asterisk/sounds/digits/mon-11.gsm and asterisk1/sounds/digits/mon-11.gsm are identical
Files asterisk/sounds/digits/mon-2.gsm and asterisk1/sounds/digits/mon-2.gsm are identical
Files asterisk/sounds/digits/mon-3.gsm and asterisk1/sounds/digits/mon-3.gsm are identical
Files asterisk/sounds/digits/mon-4.gsm and asterisk1/sounds/digits/mon-4.gsm are identical
Files asterisk/sounds/digits/mon-5.gsm and asterisk1/sounds/digits/mon-5.gsm are identical
Files asterisk/sounds/digits/mon-6.gsm and asterisk1/sounds/digits/mon-6.gsm are identical
Files asterisk/sounds/digits/mon-7.gsm and asterisk1/sounds/digits/mon-7.gsm are identical
Files asterisk/sounds/digits/mon-8.gsm and asterisk1/sounds/digits/mon-8.gsm are identical
Files asterisk/sounds/digits/mon-9.gsm and asterisk1/sounds/digits/mon-9.gsm are identical
Files asterisk/sounds/digits/oclock.gsm and asterisk1/sounds/digits/oclock.gsm are identical
Files asterisk/sounds/digits/oh.gsm and asterisk1/sounds/digits/oh.gsm are identical
Files asterisk/sounds/digits/p-m.gsm and asterisk1/sounds/digits/p-m.gsm are identical
Files asterisk/sounds/digits/pound.gsm and asterisk1/sounds/digits/pound.gsm are identical
Files asterisk/sounds/digits/star.gsm and asterisk1/sounds/digits/star.gsm are identical
Files asterisk/sounds/digits/thousand.gsm and asterisk1/sounds/digits/thousand.gsm are identical
Files asterisk/sounds/digits/today.gsm and asterisk1/sounds/digits/today.gsm are identical
Files asterisk/sounds/digits/tomorrow.gsm and asterisk1/sounds/digits/tomorrow.gsm are identical
Files asterisk/sounds/digits/yesterday.gsm and asterisk1/sounds/digits/yesterday.gsm are identical
Files asterisk/sounds/dir-instr.gsm and asterisk1/sounds/dir-instr.gsm are identical
Files asterisk/sounds/dir-intro.gsm and asterisk1/sounds/dir-intro.gsm are identical
Files asterisk/sounds/dir-nomatch.gsm and asterisk1/sounds/dir-nomatch.gsm are identical
Files asterisk/sounds/dir-nomore.gsm and asterisk1/sounds/dir-nomore.gsm are identical
Files asterisk/sounds/hours.gsm and asterisk1/sounds/hours.gsm are identical
Files asterisk/sounds/invalid.gsm and asterisk1/sounds/invalid.gsm are identical
Files asterisk/sounds/minutes.gsm and asterisk1/sounds/minutes.gsm are identical
Files asterisk/sounds/pbx-invalid.gsm and asterisk1/sounds/pbx-invalid.gsm are identical
Files asterisk/sounds/pbx-invalidpark.gsm and asterisk1/sounds/pbx-invalidpark.gsm are identical
Files asterisk/sounds/pbx-transfer.gsm and asterisk1/sounds/pbx-transfer.gsm are identical
Files asterisk/sounds/privacy-incorrect.gsm and asterisk1/sounds/privacy-incorrect.gsm are identical
Files asterisk/sounds/privacy-prompt.gsm and asterisk1/sounds/privacy-prompt.gsm are identical
Files asterisk/sounds/privacy-thankyou.gsm and asterisk1/sounds/privacy-thankyou.gsm are identical
Files asterisk/sounds/privacy-unident.gsm and asterisk1/sounds/privacy-unident.gsm are identical
Files asterisk/sounds/sample-hold.mp3 and asterisk1/sounds/sample-hold.mp3 are identical
Files asterisk/sounds/ss-noservice.gsm and asterisk1/sounds/ss-noservice.gsm are identical
Files asterisk/sounds/transfer.gsm and asterisk1/sounds/transfer.gsm are identical
Files asterisk/sounds/tt-allbusy.gsm and asterisk1/sounds/tt-allbusy.gsm are identical
Files asterisk/sounds/tt-monkeys.gsm and asterisk1/sounds/tt-monkeys.gsm are identical
Files asterisk/sounds/tt-monkeysintro.gsm and asterisk1/sounds/tt-monkeysintro.gsm are identical
Files asterisk/sounds/tt-somethingwrong.gsm and asterisk1/sounds/tt-somethingwrong.gsm are identical
Files asterisk/sounds/tt-weasels.gsm and asterisk1/sounds/tt-weasels.gsm are identical
Files asterisk/sounds/vm-Family.gsm and asterisk1/sounds/vm-Family.gsm are identical
Files asterisk/sounds/vm-Friends.gsm and asterisk1/sounds/vm-Friends.gsm are identical
Files asterisk/sounds/vm-INBOX.gsm and asterisk1/sounds/vm-INBOX.gsm are identical
Files asterisk/sounds/vm-Old.gsm and asterisk1/sounds/vm-Old.gsm are identical
Files asterisk/sounds/vm-Work.gsm and asterisk1/sounds/vm-Work.gsm are identical
Files asterisk/sounds/vm-and.gsm and asterisk1/sounds/vm-and.gsm are identical
Files asterisk/sounds/vm-changeto.gsm and asterisk1/sounds/vm-changeto.gsm are identical
Files asterisk/sounds/vm-delete.gsm and asterisk1/sounds/vm-delete.gsm are identical
Files asterisk/sounds/vm-deleted.gsm and asterisk1/sounds/vm-deleted.gsm are identical
Files asterisk/sounds/vm-extension.gsm and asterisk1/sounds/vm-extension.gsm are identical
Files asterisk/sounds/vm-first.gsm and asterisk1/sounds/vm-first.gsm are identical
Files asterisk/sounds/vm-for.gsm and asterisk1/sounds/vm-for.gsm are identical
Files asterisk/sounds/vm-goodbye.gsm and asterisk1/sounds/vm-goodbye.gsm are identical
Files asterisk/sounds/vm-helpexit.gsm and asterisk1/sounds/vm-helpexit.gsm are identical
Files asterisk/sounds/vm-incorrect.gsm and asterisk1/sounds/vm-incorrect.gsm are identical
Files asterisk/sounds/vm-instructions.gsm and asterisk1/sounds/vm-instructions.gsm are identical
Files asterisk/sounds/vm-intro.gsm and asterisk1/sounds/vm-intro.gsm are identical
Files asterisk/sounds/vm-isonphone.gsm and asterisk1/sounds/vm-isonphone.gsm are identical
Files asterisk/sounds/vm-isunavail.gsm and asterisk1/sounds/vm-isunavail.gsm are identical
Files asterisk/sounds/vm-last.gsm and asterisk1/sounds/vm-last.gsm are identical
Files asterisk/sounds/vm-login.gsm and asterisk1/sounds/vm-login.gsm are identical
Files asterisk/sounds/vm-message.gsm and asterisk1/sounds/vm-message.gsm are identical
Files asterisk/sounds/vm-messages.gsm and asterisk1/sounds/vm-messages.gsm are identical
Files asterisk/sounds/vm-mismatch.gsm and asterisk1/sounds/vm-mismatch.gsm are identical
Files asterisk/sounds/vm-msginstruct.gsm and asterisk1/sounds/vm-msginstruct.gsm are identical
Files asterisk/sounds/vm-msgsaved.gsm and asterisk1/sounds/vm-msgsaved.gsm are identical
Files asterisk/sounds/vm-newpassword.gsm and asterisk1/sounds/vm-newpassword.gsm are identical
Files asterisk/sounds/vm-next.gsm and asterisk1/sounds/vm-next.gsm are identical
Files asterisk/sounds/vm-no.gsm and asterisk1/sounds/vm-no.gsm are identical
Files asterisk/sounds/vm-nobodyavail.gsm and asterisk1/sounds/vm-nobodyavail.gsm are identical
Files asterisk/sounds/vm-nomore.gsm and asterisk1/sounds/vm-nomore.gsm are identical
Files asterisk/sounds/vm-onefor.gsm and asterisk1/sounds/vm-onefor.gsm are identical
Files asterisk/sounds/vm-options.gsm and asterisk1/sounds/vm-options.gsm are identical
Files asterisk/sounds/vm-opts.gsm and asterisk1/sounds/vm-opts.gsm are identical
Files asterisk/sounds/vm-passchanged.gsm and asterisk1/sounds/vm-passchanged.gsm are identical
Files asterisk/sounds/vm-password.gsm and asterisk1/sounds/vm-password.gsm are identical
Files asterisk/sounds/vm-press.gsm and asterisk1/sounds/vm-press.gsm are identical
Files asterisk/sounds/vm-prev.gsm and asterisk1/sounds/vm-prev.gsm are identical
Files asterisk/sounds/vm-rec-busy.gsm and asterisk1/sounds/vm-rec-busy.gsm are identical
Files asterisk/sounds/vm-rec-name.gsm and asterisk1/sounds/vm-rec-name.gsm are identical
Files asterisk/sounds/vm-rec-unv.gsm and asterisk1/sounds/vm-rec-unv.gsm are identical
Files asterisk/sounds/vm-received.gsm and asterisk1/sounds/vm-received.gsm are identical
Files asterisk/sounds/vm-reenterpassword.gsm and asterisk1/sounds/vm-reenterpassword.gsm are identical
Files asterisk/sounds/vm-repeat.gsm and asterisk1/sounds/vm-repeat.gsm are identical
Files asterisk/sounds/vm-saved.gsm and asterisk1/sounds/vm-saved.gsm are identical
Files asterisk/sounds/vm-savedto.gsm and asterisk1/sounds/vm-savedto.gsm are identical
Files asterisk/sounds/vm-savefolder.gsm and asterisk1/sounds/vm-savefolder.gsm are identical
Files asterisk/sounds/vm-savemessage.gsm and asterisk1/sounds/vm-savemessage.gsm are identical
Files asterisk/sounds/vm-sorry.gsm and asterisk1/sounds/vm-sorry.gsm are identical
Files asterisk/sounds/vm-theperson.gsm and asterisk1/sounds/vm-theperson.gsm are identical
Files asterisk/sounds/vm-tocancel.gsm and asterisk1/sounds/vm-tocancel.gsm are identical
Files asterisk/sounds/vm-toforward.gsm and asterisk1/sounds/vm-toforward.gsm are identical
Files asterisk/sounds/vm-undelete.gsm and asterisk1/sounds/vm-undelete.gsm are identical
Files asterisk/sounds/vm-undeleted.gsm and asterisk1/sounds/vm-undeleted.gsm are identical
Files asterisk/sounds/vm-whichbox.gsm and asterisk1/sounds/vm-whichbox.gsm are identical
Files asterisk/sounds/vm-youhave.gsm and asterisk1/sounds/vm-youhave.gsm are identical
Files asterisk/sounds.txt and asterisk1/sounds.txt are identical
Files asterisk/srv.c and asterisk1/srv.c are identical
Only in asterisk1: srv.c.rej
Only in asterisk1: srv.c.rej.orig
Files asterisk/stdtime/.cvsignore and asterisk1/stdtime/.cvsignore are identical
Files asterisk/stdtime/CVS/Entries and asterisk1/stdtime/CVS/Entries are identical
Files asterisk/stdtime/CVS/Repository and asterisk1/stdtime/CVS/Repository are identical
Files asterisk/stdtime/CVS/Root and asterisk1/stdtime/CVS/Root are identical
Files asterisk/stdtime/Makefile and asterisk1/stdtime/Makefile are identical
Files asterisk/stdtime/localtime.c and asterisk1/stdtime/localtime.c are identical
Files asterisk/stdtime/private.h and asterisk1/stdtime/private.h are identical
Files asterisk/stdtime/test.c and asterisk1/stdtime/test.c are identical
Files asterisk/stdtime/tzfile.h and asterisk1/stdtime/tzfile.h are identical
Files asterisk/tdd.c and asterisk1/tdd.c are identical
Files asterisk/term.c and asterisk1/term.c are identical
Files asterisk/translate.c and asterisk1/translate.c are identical
Files asterisk/ulaw.c and asterisk1/ulaw.c are identical
Files asterisk/valgrind-RedHat-8.0.supp and asterisk1/valgrind-RedHat-8.0.supp are identical
Files asterisk/vmail.cgi and asterisk1/vmail.cgi are identical
Files asterisk/vmdb.sql and asterisk1/vmdb.sql are identical
