[svn-commits] oej: branch oej/codecnegotiation r41331 - in
/team/oej/codecnegotiation: ./ a...
svn-commits at lists.digium.com
svn-commits at lists.digium.com
Wed Aug 30 04:17:38 MST 2006
Author: oej
Date: Wed Aug 30 06:17:34 2006
New Revision: 41331
URL: http://svn.digium.com/view/asterisk?rev=41331&view=rev
Log:
Reset automerge, no conflict
Added:
team/oej/codecnegotiation/build_tools/embed_modules.xml
- copied unchanged from r41318, trunk/build_tools/embed_modules.xml
team/oej/codecnegotiation/doc/asterisk.8
- copied unchanged from r41318, trunk/doc/asterisk.8
team/oej/codecnegotiation/doc/asterisk.sgml
- copied unchanged from r41318, trunk/doc/asterisk.sgml
team/oej/codecnegotiation/include/asterisk/paths.h
- copied unchanged from r41318, trunk/include/asterisk/paths.h
team/oej/codecnegotiation/main/ (props changed)
- copied from r41318, trunk/main/
team/oej/codecnegotiation/main/Makefile
- copied unchanged from r41318, trunk/main/Makefile
team/oej/codecnegotiation/main/abstract_jb.c
- copied unchanged from r41318, trunk/main/abstract_jb.c
team/oej/codecnegotiation/main/acl.c
- copied unchanged from r41318, trunk/main/acl.c
team/oej/codecnegotiation/main/aescrypt.c
- copied unchanged from r41318, trunk/main/aescrypt.c
team/oej/codecnegotiation/main/aeskey.c
- copied unchanged from r41318, trunk/main/aeskey.c
team/oej/codecnegotiation/main/aesopt.h
- copied unchanged from r41318, trunk/main/aesopt.h
team/oej/codecnegotiation/main/aestab.c
- copied unchanged from r41318, trunk/main/aestab.c
team/oej/codecnegotiation/main/alaw.c
- copied unchanged from r41318, trunk/main/alaw.c
team/oej/codecnegotiation/main/app.c
- copied unchanged from r41318, trunk/main/app.c
team/oej/codecnegotiation/main/ast_expr2.c
- copied unchanged from r41318, trunk/main/ast_expr2.c
team/oej/codecnegotiation/main/ast_expr2.fl
- copied unchanged from r41318, trunk/main/ast_expr2.fl
team/oej/codecnegotiation/main/ast_expr2.h
- copied unchanged from r41318, trunk/main/ast_expr2.h
team/oej/codecnegotiation/main/ast_expr2.y
- copied unchanged from r41318, trunk/main/ast_expr2.y
team/oej/codecnegotiation/main/ast_expr2f.c
- copied unchanged from r41318, trunk/main/ast_expr2f.c
team/oej/codecnegotiation/main/asterisk.c
- copied unchanged from r41318, trunk/main/asterisk.c
team/oej/codecnegotiation/main/astmm.c
- copied unchanged from r41318, trunk/main/astmm.c
team/oej/codecnegotiation/main/autoservice.c
- copied unchanged from r41318, trunk/main/autoservice.c
team/oej/codecnegotiation/main/buildinfo.c
- copied unchanged from r41318, trunk/main/buildinfo.c
team/oej/codecnegotiation/main/callerid.c
- copied unchanged from r41318, trunk/main/callerid.c
team/oej/codecnegotiation/main/cdr.c
- copied unchanged from r41318, trunk/main/cdr.c
team/oej/codecnegotiation/main/channel.c
- copied unchanged from r41318, trunk/main/channel.c
team/oej/codecnegotiation/main/chanvars.c
- copied unchanged from r41318, trunk/main/chanvars.c
team/oej/codecnegotiation/main/cli.c
- copied unchanged from r41318, trunk/main/cli.c
team/oej/codecnegotiation/main/coef_in.h
- copied unchanged from r41318, trunk/main/coef_in.h
team/oej/codecnegotiation/main/coef_out.h
- copied unchanged from r41318, trunk/main/coef_out.h
team/oej/codecnegotiation/main/config.c
- copied unchanged from r41318, trunk/main/config.c
team/oej/codecnegotiation/main/cryptostub.c
- copied unchanged from r41318, trunk/main/cryptostub.c
team/oej/codecnegotiation/main/db.c
- copied unchanged from r41318, trunk/main/db.c
team/oej/codecnegotiation/main/db1-ast/ (props changed)
- copied from r41318, trunk/main/db1-ast/
team/oej/codecnegotiation/main/db1-ast/Makefile
- copied unchanged from r41318, trunk/main/db1-ast/Makefile
team/oej/codecnegotiation/main/db1-ast/btree/
- copied from r41318, trunk/main/db1-ast/btree/
team/oej/codecnegotiation/main/db1-ast/btree/bt_close.c
- copied unchanged from r41318, trunk/main/db1-ast/btree/bt_close.c
team/oej/codecnegotiation/main/db1-ast/btree/bt_conv.c
- copied unchanged from r41318, trunk/main/db1-ast/btree/bt_conv.c
team/oej/codecnegotiation/main/db1-ast/btree/bt_debug.c
- copied unchanged from r41318, trunk/main/db1-ast/btree/bt_debug.c
team/oej/codecnegotiation/main/db1-ast/btree/bt_delete.c
- copied unchanged from r41318, trunk/main/db1-ast/btree/bt_delete.c
team/oej/codecnegotiation/main/db1-ast/btree/bt_get.c
- copied unchanged from r41318, trunk/main/db1-ast/btree/bt_get.c
team/oej/codecnegotiation/main/db1-ast/btree/bt_open.c
- copied unchanged from r41318, trunk/main/db1-ast/btree/bt_open.c
team/oej/codecnegotiation/main/db1-ast/btree/bt_overflow.c
- copied unchanged from r41318, trunk/main/db1-ast/btree/bt_overflow.c
team/oej/codecnegotiation/main/db1-ast/btree/bt_page.c
- copied unchanged from r41318, trunk/main/db1-ast/btree/bt_page.c
team/oej/codecnegotiation/main/db1-ast/btree/bt_put.c
- copied unchanged from r41318, trunk/main/db1-ast/btree/bt_put.c
team/oej/codecnegotiation/main/db1-ast/btree/bt_search.c
- copied unchanged from r41318, trunk/main/db1-ast/btree/bt_search.c
team/oej/codecnegotiation/main/db1-ast/btree/bt_seq.c
- copied unchanged from r41318, trunk/main/db1-ast/btree/bt_seq.c
team/oej/codecnegotiation/main/db1-ast/btree/bt_split.c
- copied unchanged from r41318, trunk/main/db1-ast/btree/bt_split.c
team/oej/codecnegotiation/main/db1-ast/btree/bt_utils.c
- copied unchanged from r41318, trunk/main/db1-ast/btree/bt_utils.c
team/oej/codecnegotiation/main/db1-ast/btree/btree.h
- copied unchanged from r41318, trunk/main/db1-ast/btree/btree.h
team/oej/codecnegotiation/main/db1-ast/btree/extern.h
- copied unchanged from r41318, trunk/main/db1-ast/btree/extern.h
team/oej/codecnegotiation/main/db1-ast/db/
- copied from r41318, trunk/main/db1-ast/db/
team/oej/codecnegotiation/main/db1-ast/db/db.c
- copied unchanged from r41318, trunk/main/db1-ast/db/db.c
team/oej/codecnegotiation/main/db1-ast/hash/
- copied from r41318, trunk/main/db1-ast/hash/
team/oej/codecnegotiation/main/db1-ast/hash/README
- copied unchanged from r41318, trunk/main/db1-ast/hash/README
team/oej/codecnegotiation/main/db1-ast/hash/extern.h
- copied unchanged from r41318, trunk/main/db1-ast/hash/extern.h
team/oej/codecnegotiation/main/db1-ast/hash/hash.c
- copied unchanged from r41318, trunk/main/db1-ast/hash/hash.c
team/oej/codecnegotiation/main/db1-ast/hash/hash.h
- copied unchanged from r41318, trunk/main/db1-ast/hash/hash.h
team/oej/codecnegotiation/main/db1-ast/hash/hash_bigkey.c
- copied unchanged from r41318, trunk/main/db1-ast/hash/hash_bigkey.c
team/oej/codecnegotiation/main/db1-ast/hash/hash_buf.c
- copied unchanged from r41318, trunk/main/db1-ast/hash/hash_buf.c
team/oej/codecnegotiation/main/db1-ast/hash/hash_func.c
- copied unchanged from r41318, trunk/main/db1-ast/hash/hash_func.c
team/oej/codecnegotiation/main/db1-ast/hash/hash_log2.c
- copied unchanged from r41318, trunk/main/db1-ast/hash/hash_log2.c
team/oej/codecnegotiation/main/db1-ast/hash/hash_page.c
- copied unchanged from r41318, trunk/main/db1-ast/hash/hash_page.c
team/oej/codecnegotiation/main/db1-ast/hash/hsearch.c
- copied unchanged from r41318, trunk/main/db1-ast/hash/hsearch.c
team/oej/codecnegotiation/main/db1-ast/hash/ndbm.c
- copied unchanged from r41318, trunk/main/db1-ast/hash/ndbm.c
team/oej/codecnegotiation/main/db1-ast/hash/page.h
- copied unchanged from r41318, trunk/main/db1-ast/hash/page.h
team/oej/codecnegotiation/main/db1-ast/hash/search.h
- copied unchanged from r41318, trunk/main/db1-ast/hash/search.h
team/oej/codecnegotiation/main/db1-ast/include/
- copied from r41318, trunk/main/db1-ast/include/
team/oej/codecnegotiation/main/db1-ast/include/circ-queue.h
- copied unchanged from r41318, trunk/main/db1-ast/include/circ-queue.h
team/oej/codecnegotiation/main/db1-ast/include/compat.h
- copied unchanged from r41318, trunk/main/db1-ast/include/compat.h
team/oej/codecnegotiation/main/db1-ast/include/db.h
- copied unchanged from r41318, trunk/main/db1-ast/include/db.h
team/oej/codecnegotiation/main/db1-ast/include/mpool.h
- copied unchanged from r41318, trunk/main/db1-ast/include/mpool.h
team/oej/codecnegotiation/main/db1-ast/include/ndbm.h
- copied unchanged from r41318, trunk/main/db1-ast/include/ndbm.h
team/oej/codecnegotiation/main/db1-ast/libdb.map
- copied unchanged from r41318, trunk/main/db1-ast/libdb.map
team/oej/codecnegotiation/main/db1-ast/mpool/
- copied from r41318, trunk/main/db1-ast/mpool/
team/oej/codecnegotiation/main/db1-ast/mpool/README
- copied unchanged from r41318, trunk/main/db1-ast/mpool/README
team/oej/codecnegotiation/main/db1-ast/mpool/mpool.c
- copied unchanged from r41318, trunk/main/db1-ast/mpool/mpool.c
team/oej/codecnegotiation/main/db1-ast/recno/
- copied from r41318, trunk/main/db1-ast/recno/
team/oej/codecnegotiation/main/db1-ast/recno/extern.h
- copied unchanged from r41318, trunk/main/db1-ast/recno/extern.h
team/oej/codecnegotiation/main/db1-ast/recno/rec_close.c
- copied unchanged from r41318, trunk/main/db1-ast/recno/rec_close.c
team/oej/codecnegotiation/main/db1-ast/recno/rec_delete.c
- copied unchanged from r41318, trunk/main/db1-ast/recno/rec_delete.c
team/oej/codecnegotiation/main/db1-ast/recno/rec_get.c
- copied unchanged from r41318, trunk/main/db1-ast/recno/rec_get.c
team/oej/codecnegotiation/main/db1-ast/recno/rec_open.c
- copied unchanged from r41318, trunk/main/db1-ast/recno/rec_open.c
team/oej/codecnegotiation/main/db1-ast/recno/rec_put.c
- copied unchanged from r41318, trunk/main/db1-ast/recno/rec_put.c
team/oej/codecnegotiation/main/db1-ast/recno/rec_search.c
- copied unchanged from r41318, trunk/main/db1-ast/recno/rec_search.c
team/oej/codecnegotiation/main/db1-ast/recno/rec_seq.c
- copied unchanged from r41318, trunk/main/db1-ast/recno/rec_seq.c
team/oej/codecnegotiation/main/db1-ast/recno/rec_utils.c
- copied unchanged from r41318, trunk/main/db1-ast/recno/rec_utils.c
team/oej/codecnegotiation/main/db1-ast/recno/recno.h
- copied unchanged from r41318, trunk/main/db1-ast/recno/recno.h
team/oej/codecnegotiation/main/devicestate.c
- copied unchanged from r41318, trunk/main/devicestate.c
team/oej/codecnegotiation/main/dlfcn.c
- copied unchanged from r41318, trunk/main/dlfcn.c
team/oej/codecnegotiation/main/dns.c
- copied unchanged from r41318, trunk/main/dns.c
team/oej/codecnegotiation/main/dnsmgr.c
- copied unchanged from r41318, trunk/main/dnsmgr.c
team/oej/codecnegotiation/main/dsp.c
- copied unchanged from r41318, trunk/main/dsp.c
team/oej/codecnegotiation/main/ecdisa.h
- copied unchanged from r41318, trunk/main/ecdisa.h
team/oej/codecnegotiation/main/editline/ (props changed)
- copied from r41318, trunk/main/editline/
team/oej/codecnegotiation/main/editline/CHANGES
- copied unchanged from r41318, trunk/main/editline/CHANGES
team/oej/codecnegotiation/main/editline/INSTALL
- copied unchanged from r41318, trunk/main/editline/INSTALL
team/oej/codecnegotiation/main/editline/Makefile.in
- copied unchanged from r41318, trunk/main/editline/Makefile.in
team/oej/codecnegotiation/main/editline/PLATFORMS
- copied unchanged from r41318, trunk/main/editline/PLATFORMS
team/oej/codecnegotiation/main/editline/README
- copied unchanged from r41318, trunk/main/editline/README
team/oej/codecnegotiation/main/editline/TEST/
- copied from r41318, trunk/main/editline/TEST/
team/oej/codecnegotiation/main/editline/TEST/test.c
- copied unchanged from r41318, trunk/main/editline/TEST/test.c
team/oej/codecnegotiation/main/editline/chared.c
- copied unchanged from r41318, trunk/main/editline/chared.c
team/oej/codecnegotiation/main/editline/chared.h
- copied unchanged from r41318, trunk/main/editline/chared.h
team/oej/codecnegotiation/main/editline/common.c
- copied unchanged from r41318, trunk/main/editline/common.c
team/oej/codecnegotiation/main/editline/config.guess
- copied unchanged from r41318, trunk/main/editline/config.guess
team/oej/codecnegotiation/main/editline/config.h.in
- copied unchanged from r41318, trunk/main/editline/config.h.in
team/oej/codecnegotiation/main/editline/config.sub
- copied unchanged from r41318, trunk/main/editline/config.sub
team/oej/codecnegotiation/main/editline/configure
- copied unchanged from r41318, trunk/main/editline/configure
team/oej/codecnegotiation/main/editline/configure.in
- copied unchanged from r41318, trunk/main/editline/configure.in
team/oej/codecnegotiation/main/editline/editline.3
- copied unchanged from r41318, trunk/main/editline/editline.3
team/oej/codecnegotiation/main/editline/editrc.5
- copied unchanged from r41318, trunk/main/editline/editrc.5
team/oej/codecnegotiation/main/editline/el.c
- copied unchanged from r41318, trunk/main/editline/el.c
team/oej/codecnegotiation/main/editline/el.h
- copied unchanged from r41318, trunk/main/editline/el.h
team/oej/codecnegotiation/main/editline/emacs.c
- copied unchanged from r41318, trunk/main/editline/emacs.c
team/oej/codecnegotiation/main/editline/hist.c
- copied unchanged from r41318, trunk/main/editline/hist.c
team/oej/codecnegotiation/main/editline/hist.h
- copied unchanged from r41318, trunk/main/editline/hist.h
team/oej/codecnegotiation/main/editline/histedit.h
- copied unchanged from r41318, trunk/main/editline/histedit.h
team/oej/codecnegotiation/main/editline/history.c
- copied unchanged from r41318, trunk/main/editline/history.c
team/oej/codecnegotiation/main/editline/install-sh
- copied unchanged from r41318, trunk/main/editline/install-sh
team/oej/codecnegotiation/main/editline/key.c
- copied unchanged from r41318, trunk/main/editline/key.c
team/oej/codecnegotiation/main/editline/key.h
- copied unchanged from r41318, trunk/main/editline/key.h
team/oej/codecnegotiation/main/editline/makelist
- copied unchanged from r41318, trunk/main/editline/makelist
team/oej/codecnegotiation/main/editline/map.c
- copied unchanged from r41318, trunk/main/editline/map.c
team/oej/codecnegotiation/main/editline/map.h
- copied unchanged from r41318, trunk/main/editline/map.h
team/oej/codecnegotiation/main/editline/np/ (props changed)
- copied from r41318, trunk/main/editline/np/
team/oej/codecnegotiation/main/editline/np/fgetln.c
- copied unchanged from r41318, trunk/main/editline/np/fgetln.c
team/oej/codecnegotiation/main/editline/np/strlcat.c
- copied unchanged from r41318, trunk/main/editline/np/strlcat.c
team/oej/codecnegotiation/main/editline/np/strlcpy.c
- copied unchanged from r41318, trunk/main/editline/np/strlcpy.c
team/oej/codecnegotiation/main/editline/np/unvis.c
- copied unchanged from r41318, trunk/main/editline/np/unvis.c
team/oej/codecnegotiation/main/editline/np/vis.c
- copied unchanged from r41318, trunk/main/editline/np/vis.c
team/oej/codecnegotiation/main/editline/np/vis.h
- copied unchanged from r41318, trunk/main/editline/np/vis.h
team/oej/codecnegotiation/main/editline/parse.c
- copied unchanged from r41318, trunk/main/editline/parse.c
team/oej/codecnegotiation/main/editline/parse.h
- copied unchanged from r41318, trunk/main/editline/parse.h
team/oej/codecnegotiation/main/editline/prompt.c
- copied unchanged from r41318, trunk/main/editline/prompt.c
team/oej/codecnegotiation/main/editline/prompt.h
- copied unchanged from r41318, trunk/main/editline/prompt.h
team/oej/codecnegotiation/main/editline/read.c
- copied unchanged from r41318, trunk/main/editline/read.c
team/oej/codecnegotiation/main/editline/read.h
- copied unchanged from r41318, trunk/main/editline/read.h
team/oej/codecnegotiation/main/editline/readline/
- copied from r41318, trunk/main/editline/readline/
team/oej/codecnegotiation/main/editline/readline.c
- copied unchanged from r41318, trunk/main/editline/readline.c
team/oej/codecnegotiation/main/editline/readline/readline.h
- copied unchanged from r41318, trunk/main/editline/readline/readline.h
team/oej/codecnegotiation/main/editline/refresh.c
- copied unchanged from r41318, trunk/main/editline/refresh.c
team/oej/codecnegotiation/main/editline/refresh.h
- copied unchanged from r41318, trunk/main/editline/refresh.h
team/oej/codecnegotiation/main/editline/search.c
- copied unchanged from r41318, trunk/main/editline/search.c
team/oej/codecnegotiation/main/editline/search.h
- copied unchanged from r41318, trunk/main/editline/search.h
team/oej/codecnegotiation/main/editline/sig.c
- copied unchanged from r41318, trunk/main/editline/sig.c
team/oej/codecnegotiation/main/editline/sig.h
- copied unchanged from r41318, trunk/main/editline/sig.h
team/oej/codecnegotiation/main/editline/sys.h
- copied unchanged from r41318, trunk/main/editline/sys.h
team/oej/codecnegotiation/main/editline/term.c
- copied unchanged from r41318, trunk/main/editline/term.c
team/oej/codecnegotiation/main/editline/term.h
- copied unchanged from r41318, trunk/main/editline/term.h
team/oej/codecnegotiation/main/editline/tokenizer.c
- copied unchanged from r41318, trunk/main/editline/tokenizer.c
team/oej/codecnegotiation/main/editline/tokenizer.h
- copied unchanged from r41318, trunk/main/editline/tokenizer.h
team/oej/codecnegotiation/main/editline/tty.c
- copied unchanged from r41318, trunk/main/editline/tty.c
team/oej/codecnegotiation/main/editline/tty.h
- copied unchanged from r41318, trunk/main/editline/tty.h
team/oej/codecnegotiation/main/editline/vi.c
- copied unchanged from r41318, trunk/main/editline/vi.c
team/oej/codecnegotiation/main/enum.c
- copied unchanged from r41318, trunk/main/enum.c
team/oej/codecnegotiation/main/file.c
- copied unchanged from r41318, trunk/main/file.c
team/oej/codecnegotiation/main/fixedjitterbuf.c
- copied unchanged from r41318, trunk/main/fixedjitterbuf.c
team/oej/codecnegotiation/main/fixedjitterbuf.h
- copied unchanged from r41318, trunk/main/fixedjitterbuf.h
team/oej/codecnegotiation/main/frame.c
- copied unchanged from r41318, trunk/main/frame.c
team/oej/codecnegotiation/main/fskmodem.c
- copied unchanged from r41318, trunk/main/fskmodem.c
team/oej/codecnegotiation/main/http.c
- copied unchanged from r41318, trunk/main/http.c
team/oej/codecnegotiation/main/image.c
- copied unchanged from r41318, trunk/main/image.c
team/oej/codecnegotiation/main/indications.c
- copied unchanged from r41318, trunk/main/indications.c
team/oej/codecnegotiation/main/io.c
- copied unchanged from r41318, trunk/main/io.c
team/oej/codecnegotiation/main/jitterbuf.c
- copied unchanged from r41318, trunk/main/jitterbuf.c
team/oej/codecnegotiation/main/jitterbuf.h
- copied unchanged from r41318, trunk/main/jitterbuf.h
team/oej/codecnegotiation/main/loader.c
- copied unchanged from r41318, trunk/main/loader.c
team/oej/codecnegotiation/main/logger.c
- copied unchanged from r41318, trunk/main/logger.c
team/oej/codecnegotiation/main/manager.c
- copied unchanged from r41318, trunk/main/manager.c
team/oej/codecnegotiation/main/md5.c
- copied unchanged from r41318, trunk/main/md5.c
team/oej/codecnegotiation/main/netsock.c
- copied unchanged from r41318, trunk/main/netsock.c
team/oej/codecnegotiation/main/pbx.c
- copied unchanged from r41318, trunk/main/pbx.c
team/oej/codecnegotiation/main/plc.c
- copied unchanged from r41318, trunk/main/plc.c
team/oej/codecnegotiation/main/poll.c
- copied unchanged from r41318, trunk/main/poll.c
team/oej/codecnegotiation/main/privacy.c
- copied unchanged from r41318, trunk/main/privacy.c
team/oej/codecnegotiation/main/rtp.c
- copied unchanged from r41318, trunk/main/rtp.c
team/oej/codecnegotiation/main/say.c
- copied unchanged from r41318, trunk/main/say.c
team/oej/codecnegotiation/main/sched.c
- copied unchanged from r41318, trunk/main/sched.c
team/oej/codecnegotiation/main/sha1.c
- copied unchanged from r41318, trunk/main/sha1.c
team/oej/codecnegotiation/main/slinfactory.c
- copied unchanged from r41318, trunk/main/slinfactory.c
team/oej/codecnegotiation/main/srv.c
- copied unchanged from r41318, trunk/main/srv.c
team/oej/codecnegotiation/main/stdtime/ (props changed)
- copied from r41318, trunk/main/stdtime/
team/oej/codecnegotiation/main/stdtime/Makefile
- copied unchanged from r41318, trunk/main/stdtime/Makefile
team/oej/codecnegotiation/main/stdtime/localtime.c
- copied unchanged from r41318, trunk/main/stdtime/localtime.c
team/oej/codecnegotiation/main/stdtime/test.c
- copied unchanged from r41318, trunk/main/stdtime/test.c
team/oej/codecnegotiation/main/stdtime/tzfile.h
- copied unchanged from r41318, trunk/main/stdtime/tzfile.h
team/oej/codecnegotiation/main/strcompat.c
- copied unchanged from r41318, trunk/main/strcompat.c
team/oej/codecnegotiation/main/tdd.c
- copied unchanged from r41318, trunk/main/tdd.c
team/oej/codecnegotiation/main/term.c
- copied unchanged from r41318, trunk/main/term.c
team/oej/codecnegotiation/main/translate.c
- copied unchanged from r41318, trunk/main/translate.c
team/oej/codecnegotiation/main/udptl.c
- copied unchanged from r41318, trunk/main/udptl.c
team/oej/codecnegotiation/main/ulaw.c
- copied unchanged from r41318, trunk/main/ulaw.c
team/oej/codecnegotiation/main/utils.c
- copied unchanged from r41318, trunk/main/utils.c
team/oej/codecnegotiation/pbx/ael/ael-test/ael-test14/
- copied from r41318, trunk/pbx/ael/ael-test/ael-test14/
team/oej/codecnegotiation/pbx/ael/ael-test/ael-test14/extensions.ael
- copied unchanged from r41318, trunk/pbx/ael/ael-test/ael-test14/extensions.ael
team/oej/codecnegotiation/pbx/ael/ael-test/ref.ael-test14
- copied unchanged from r41318, trunk/pbx/ael/ael-test/ref.ael-test14
team/oej/codecnegotiation/utils/muted.c
- copied unchanged from r41318, trunk/utils/muted.c
Removed:
team/oej/codecnegotiation/abstract_jb.c
team/oej/codecnegotiation/acl.c
team/oej/codecnegotiation/aescrypt.c
team/oej/codecnegotiation/aeskey.c
team/oej/codecnegotiation/aesopt.h
team/oej/codecnegotiation/aestab.c
team/oej/codecnegotiation/alaw.c
team/oej/codecnegotiation/app.c
team/oej/codecnegotiation/ast_expr2.c
team/oej/codecnegotiation/ast_expr2.fl
team/oej/codecnegotiation/ast_expr2.h
team/oej/codecnegotiation/ast_expr2.y
team/oej/codecnegotiation/ast_expr2f.c
team/oej/codecnegotiation/asterisk.8
team/oej/codecnegotiation/asterisk.c
team/oej/codecnegotiation/asterisk.sgml
team/oej/codecnegotiation/astmm.c
team/oej/codecnegotiation/autoservice.c
team/oej/codecnegotiation/buildinfo.c
team/oej/codecnegotiation/callerid.c
team/oej/codecnegotiation/cdr.c
team/oej/codecnegotiation/channel.c
team/oej/codecnegotiation/chanvars.c
team/oej/codecnegotiation/cli.c
team/oej/codecnegotiation/coef_in.h
team/oej/codecnegotiation/coef_out.h
team/oej/codecnegotiation/config.c
team/oej/codecnegotiation/cryptostub.c
team/oej/codecnegotiation/cygwin/
team/oej/codecnegotiation/db.c
team/oej/codecnegotiation/db1-ast/
team/oej/codecnegotiation/devicestate.c
team/oej/codecnegotiation/dlfcn.c
team/oej/codecnegotiation/dns.c
team/oej/codecnegotiation/dnsmgr.c
team/oej/codecnegotiation/dsp.c
team/oej/codecnegotiation/ecdisa.h
team/oej/codecnegotiation/editline/
team/oej/codecnegotiation/enum.c
team/oej/codecnegotiation/file.c
team/oej/codecnegotiation/fixedjitterbuf.c
team/oej/codecnegotiation/fixedjitterbuf.h
team/oej/codecnegotiation/frame.c
team/oej/codecnegotiation/fskmodem.c
team/oej/codecnegotiation/http.c
team/oej/codecnegotiation/image.c
team/oej/codecnegotiation/indications.c
team/oej/codecnegotiation/io.c
team/oej/codecnegotiation/jitterbuf.c
team/oej/codecnegotiation/jitterbuf.h
team/oej/codecnegotiation/loader.c
team/oej/codecnegotiation/logger.c
team/oej/codecnegotiation/manager.c
team/oej/codecnegotiation/md5.c
team/oej/codecnegotiation/muted.c
team/oej/codecnegotiation/netsock.c
team/oej/codecnegotiation/pbx.c
team/oej/codecnegotiation/plc.c
team/oej/codecnegotiation/poll.c
team/oej/codecnegotiation/privacy.c
team/oej/codecnegotiation/rtp.c
team/oej/codecnegotiation/say.c
team/oej/codecnegotiation/sched.c
team/oej/codecnegotiation/sha1.c
team/oej/codecnegotiation/slinfactory.c
team/oej/codecnegotiation/sounds.txt
team/oej/codecnegotiation/srv.c
team/oej/codecnegotiation/stdtime/
team/oej/codecnegotiation/strcompat.c
team/oej/codecnegotiation/tdd.c
team/oej/codecnegotiation/term.c
team/oej/codecnegotiation/translate.c
team/oej/codecnegotiation/udptl.c
team/oej/codecnegotiation/ulaw.c
team/oej/codecnegotiation/utils.c
Modified:
team/oej/codecnegotiation/ (props changed)
team/oej/codecnegotiation/.cleancount
team/oej/codecnegotiation/Makefile
team/oej/codecnegotiation/Makefile.moddir_rules
team/oej/codecnegotiation/Makefile.rules
team/oej/codecnegotiation/UPGRADE.txt
team/oej/codecnegotiation/acinclude.m4
team/oej/codecnegotiation/agi/Makefile
team/oej/codecnegotiation/apps/ (props changed)
team/oej/codecnegotiation/apps/Makefile
team/oej/codecnegotiation/apps/app_adsiprog.c
team/oej/codecnegotiation/apps/app_alarmreceiver.c
team/oej/codecnegotiation/apps/app_amd.c
team/oej/codecnegotiation/apps/app_authenticate.c
team/oej/codecnegotiation/apps/app_cdr.c
team/oej/codecnegotiation/apps/app_chanisavail.c
team/oej/codecnegotiation/apps/app_channelredirect.c
team/oej/codecnegotiation/apps/app_chanspy.c
team/oej/codecnegotiation/apps/app_controlplayback.c
team/oej/codecnegotiation/apps/app_db.c
team/oej/codecnegotiation/apps/app_dial.c
team/oej/codecnegotiation/apps/app_dictate.c
team/oej/codecnegotiation/apps/app_directed_pickup.c
team/oej/codecnegotiation/apps/app_directory.c
team/oej/codecnegotiation/apps/app_disa.c
team/oej/codecnegotiation/apps/app_dumpchan.c
team/oej/codecnegotiation/apps/app_echo.c
team/oej/codecnegotiation/apps/app_exec.c
team/oej/codecnegotiation/apps/app_externalivr.c
team/oej/codecnegotiation/apps/app_festival.c
team/oej/codecnegotiation/apps/app_flash.c
team/oej/codecnegotiation/apps/app_followme.c
team/oej/codecnegotiation/apps/app_forkcdr.c
team/oej/codecnegotiation/apps/app_getcpeid.c
team/oej/codecnegotiation/apps/app_hasnewvoicemail.c
team/oej/codecnegotiation/apps/app_ices.c
team/oej/codecnegotiation/apps/app_image.c
team/oej/codecnegotiation/apps/app_ivrdemo.c
team/oej/codecnegotiation/apps/app_lookupblacklist.c
team/oej/codecnegotiation/apps/app_lookupcidname.c
team/oej/codecnegotiation/apps/app_macro.c
team/oej/codecnegotiation/apps/app_meetme.c
team/oej/codecnegotiation/apps/app_milliwatt.c
team/oej/codecnegotiation/apps/app_mixmonitor.c
team/oej/codecnegotiation/apps/app_morsecode.c
team/oej/codecnegotiation/apps/app_mp3.c
team/oej/codecnegotiation/apps/app_nbscat.c
team/oej/codecnegotiation/apps/app_osplookup.c
team/oej/codecnegotiation/apps/app_page.c
team/oej/codecnegotiation/apps/app_parkandannounce.c
team/oej/codecnegotiation/apps/app_playback.c
team/oej/codecnegotiation/apps/app_privacy.c
team/oej/codecnegotiation/apps/app_queue.c
team/oej/codecnegotiation/apps/app_random.c
team/oej/codecnegotiation/apps/app_read.c
team/oej/codecnegotiation/apps/app_readfile.c
team/oej/codecnegotiation/apps/app_realtime.c
team/oej/codecnegotiation/apps/app_record.c
team/oej/codecnegotiation/apps/app_rpt.c
team/oej/codecnegotiation/apps/app_sayunixtime.c
team/oej/codecnegotiation/apps/app_senddtmf.c
team/oej/codecnegotiation/apps/app_sendtext.c
team/oej/codecnegotiation/apps/app_setcallerid.c
team/oej/codecnegotiation/apps/app_setcdruserfield.c
team/oej/codecnegotiation/apps/app_settransfercapability.c
team/oej/codecnegotiation/apps/app_skel.c
team/oej/codecnegotiation/apps/app_sms.c
team/oej/codecnegotiation/apps/app_softhangup.c
team/oej/codecnegotiation/apps/app_speech_utils.c
team/oej/codecnegotiation/apps/app_stack.c
team/oej/codecnegotiation/apps/app_system.c
team/oej/codecnegotiation/apps/app_talkdetect.c
team/oej/codecnegotiation/apps/app_test.c
team/oej/codecnegotiation/apps/app_transfer.c
team/oej/codecnegotiation/apps/app_url.c
team/oej/codecnegotiation/apps/app_userevent.c
team/oej/codecnegotiation/apps/app_verbose.c
team/oej/codecnegotiation/apps/app_voicemail.c
team/oej/codecnegotiation/apps/app_waitforring.c
team/oej/codecnegotiation/apps/app_waitforsilence.c
team/oej/codecnegotiation/apps/app_while.c
team/oej/codecnegotiation/apps/app_zapateller.c
team/oej/codecnegotiation/apps/app_zapbarge.c
team/oej/codecnegotiation/apps/app_zapras.c
team/oej/codecnegotiation/apps/app_zapscan.c
team/oej/codecnegotiation/bootstrap.sh
team/oej/codecnegotiation/build_tools/cflags.xml
team/oej/codecnegotiation/build_tools/make_buildopts_h
team/oej/codecnegotiation/build_tools/make_version
team/oej/codecnegotiation/build_tools/menuselect-deps.in
team/oej/codecnegotiation/build_tools/mkpkgconfig
team/oej/codecnegotiation/build_tools/prep_moduledeps
team/oej/codecnegotiation/cdr/ (props changed)
team/oej/codecnegotiation/cdr/Makefile
team/oej/codecnegotiation/cdr/cdr_csv.c
team/oej/codecnegotiation/cdr/cdr_custom.c
team/oej/codecnegotiation/cdr/cdr_manager.c
team/oej/codecnegotiation/cdr/cdr_odbc.c
team/oej/codecnegotiation/cdr/cdr_pgsql.c
team/oej/codecnegotiation/cdr/cdr_radius.c
team/oej/codecnegotiation/cdr/cdr_sqlite.c
team/oej/codecnegotiation/cdr/cdr_tds.c
team/oej/codecnegotiation/channels/ (props changed)
team/oej/codecnegotiation/channels/Makefile
team/oej/codecnegotiation/channels/chan_agent.c
team/oej/codecnegotiation/channels/chan_alsa.c
team/oej/codecnegotiation/channels/chan_features.c
team/oej/codecnegotiation/channels/chan_h323.c
team/oej/codecnegotiation/channels/chan_iax2.c
team/oej/codecnegotiation/channels/chan_jingle.c
team/oej/codecnegotiation/channels/chan_local.c
team/oej/codecnegotiation/channels/chan_mgcp.c
team/oej/codecnegotiation/channels/chan_misdn.c
team/oej/codecnegotiation/channels/chan_nbs.c
team/oej/codecnegotiation/channels/chan_oss.c
team/oej/codecnegotiation/channels/chan_phone.c
team/oej/codecnegotiation/channels/chan_sip.c
team/oej/codecnegotiation/channels/chan_skinny.c
team/oej/codecnegotiation/channels/chan_zap.c
team/oej/codecnegotiation/channels/h323/Makefile
team/oej/codecnegotiation/channels/iax2-parser.c
team/oej/codecnegotiation/channels/iax2-parser.h
team/oej/codecnegotiation/channels/misdn/Makefile
team/oej/codecnegotiation/channels/misdn/ie.c
team/oej/codecnegotiation/channels/misdn/isdn_lib.c
team/oej/codecnegotiation/channels/misdn/isdn_lib.h
team/oej/codecnegotiation/channels/misdn/isdn_lib_intern.h
team/oej/codecnegotiation/channels/misdn/isdn_msg_parser.c
team/oej/codecnegotiation/codecs/ (props changed)
team/oej/codecnegotiation/codecs/Makefile
team/oej/codecnegotiation/codecs/codec_a_mu.c
team/oej/codecnegotiation/codecs/codec_adpcm.c
team/oej/codecnegotiation/codecs/codec_alaw.c
team/oej/codecnegotiation/codecs/codec_g726.c
team/oej/codecnegotiation/codecs/codec_gsm.c
team/oej/codecnegotiation/codecs/codec_ilbc.c
team/oej/codecnegotiation/codecs/codec_lpc10.c
team/oej/codecnegotiation/codecs/codec_speex.c
team/oej/codecnegotiation/codecs/codec_ulaw.c
team/oej/codecnegotiation/codecs/codec_zap.c
team/oej/codecnegotiation/codecs/gsm/Makefile
team/oej/codecnegotiation/configs/features.conf.sample
team/oej/codecnegotiation/configs/modules.conf.sample
team/oej/codecnegotiation/configs/zapata.conf.sample
team/oej/codecnegotiation/configure
team/oej/codecnegotiation/configure.ac
team/oej/codecnegotiation/contrib/asterisk-ng-doxygen
team/oej/codecnegotiation/doc/queues-with-callback-members.txt
team/oej/codecnegotiation/doc/speechrec.txt
team/oej/codecnegotiation/formats/ (props changed)
team/oej/codecnegotiation/formats/Makefile
team/oej/codecnegotiation/formats/format_g723.c
team/oej/codecnegotiation/formats/format_g726.c
team/oej/codecnegotiation/formats/format_g729.c
team/oej/codecnegotiation/formats/format_gsm.c
team/oej/codecnegotiation/formats/format_h263.c
team/oej/codecnegotiation/formats/format_h264.c
team/oej/codecnegotiation/formats/format_ilbc.c
team/oej/codecnegotiation/formats/format_jpeg.c
team/oej/codecnegotiation/formats/format_ogg_vorbis.c
team/oej/codecnegotiation/formats/format_pcm.c
team/oej/codecnegotiation/formats/format_sln.c
team/oej/codecnegotiation/formats/format_vox.c
team/oej/codecnegotiation/formats/format_wav.c
team/oej/codecnegotiation/formats/format_wav_gsm.c
team/oej/codecnegotiation/funcs/ (props changed)
team/oej/codecnegotiation/funcs/Makefile
team/oej/codecnegotiation/funcs/func_base64.c
team/oej/codecnegotiation/funcs/func_callerid.c
team/oej/codecnegotiation/funcs/func_cdr.c
team/oej/codecnegotiation/funcs/func_channel.c
team/oej/codecnegotiation/funcs/func_curl.c
team/oej/codecnegotiation/funcs/func_cut.c
team/oej/codecnegotiation/funcs/func_db.c
team/oej/codecnegotiation/funcs/func_enum.c
team/oej/codecnegotiation/funcs/func_env.c
team/oej/codecnegotiation/funcs/func_global.c
team/oej/codecnegotiation/funcs/func_groupcount.c
team/oej/codecnegotiation/funcs/func_language.c
team/oej/codecnegotiation/funcs/func_logic.c
team/oej/codecnegotiation/funcs/func_math.c
team/oej/codecnegotiation/funcs/func_md5.c
team/oej/codecnegotiation/funcs/func_moh.c
team/oej/codecnegotiation/funcs/func_odbc.c
team/oej/codecnegotiation/funcs/func_rand.c
team/oej/codecnegotiation/funcs/func_realtime.c
team/oej/codecnegotiation/funcs/func_sha1.c
team/oej/codecnegotiation/funcs/func_strings.c
team/oej/codecnegotiation/funcs/func_timeout.c
team/oej/codecnegotiation/funcs/func_uri.c
team/oej/codecnegotiation/include/asterisk.h
team/oej/codecnegotiation/include/asterisk/abstract_jb.h
team/oej/codecnegotiation/include/asterisk/autoconfig.h.in
team/oej/codecnegotiation/include/asterisk/cdr.h
team/oej/codecnegotiation/include/asterisk/channel.h
team/oej/codecnegotiation/include/asterisk/chanspy.h
team/oej/codecnegotiation/include/asterisk/compiler.h
team/oej/codecnegotiation/include/asterisk/dns.h
team/oej/codecnegotiation/include/asterisk/features.h
team/oej/codecnegotiation/include/asterisk/file.h
team/oej/codecnegotiation/include/asterisk/frame.h
team/oej/codecnegotiation/include/asterisk/indications.h
team/oej/codecnegotiation/include/asterisk/linkedlists.h
team/oej/codecnegotiation/include/asterisk/lock.h
team/oej/codecnegotiation/include/asterisk/module.h
team/oej/codecnegotiation/include/asterisk/monitor.h
team/oej/codecnegotiation/include/asterisk/rtp.h
team/oej/codecnegotiation/include/asterisk/slinfactory.h
team/oej/codecnegotiation/include/asterisk/srv.h
team/oej/codecnegotiation/include/asterisk/translate.h
team/oej/codecnegotiation/include/asterisk/utils.h
team/oej/codecnegotiation/makeopts.in
team/oej/codecnegotiation/pbx/ (props changed)
team/oej/codecnegotiation/pbx/Makefile
team/oej/codecnegotiation/pbx/pbx_ael.c
team/oej/codecnegotiation/pbx/pbx_config.c
team/oej/codecnegotiation/pbx/pbx_dundi.c
team/oej/codecnegotiation/pbx/pbx_loopback.c
team/oej/codecnegotiation/pbx/pbx_realtime.c
team/oej/codecnegotiation/pbx/pbx_spool.c
team/oej/codecnegotiation/res/ (props changed)
team/oej/codecnegotiation/res/Makefile
team/oej/codecnegotiation/res/res_adsi.c
team/oej/codecnegotiation/res/res_agi.c
team/oej/codecnegotiation/res/res_clioriginate.c
team/oej/codecnegotiation/res/res_config_odbc.c
team/oej/codecnegotiation/res/res_config_pgsql.c
team/oej/codecnegotiation/res/res_convert.c
team/oej/codecnegotiation/res/res_crypto.c
team/oej/codecnegotiation/res/res_features.c
team/oej/codecnegotiation/res/res_indications.c
team/oej/codecnegotiation/res/res_jabber.c
team/oej/codecnegotiation/res/res_monitor.c
team/oej/codecnegotiation/res/res_musiconhold.c
team/oej/codecnegotiation/res/res_odbc.c
team/oej/codecnegotiation/res/res_smdi.c
team/oej/codecnegotiation/res/res_snmp.c
team/oej/codecnegotiation/res/res_speech.c
team/oej/codecnegotiation/sounds/Makefile
team/oej/codecnegotiation/utils/ (props changed)
team/oej/codecnegotiation/utils/Makefile
team/oej/codecnegotiation/utils/ael_main.c
team/oej/codecnegotiation/utils/smsq.c
Propchange: team/oej/codecnegotiation/
------------------------------------------------------------------------------
automerge = http://edvina.net/training/
Propchange: team/oej/codecnegotiation/
------------------------------------------------------------------------------
Binary property 'branch-1.2-blocked' - no diff available.
Propchange: team/oej/codecnegotiation/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.
Propchange: team/oej/codecnegotiation/
------------------------------------------------------------------------------
--- svn:externals (original)
+++ svn:externals Wed Aug 30 06:17:34 2006
@@ -1,2 +1,1 @@
-menuselect http://svn.digium.com/svn/menuselect/trunk
-mxml http://svn.digium.com/svn/mxml/trunk
+menuselect http://svn.digium.com/svn/menuselect/branches/1.0
Propchange: team/oej/codecnegotiation/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Aug 30 06:17:34 2006
@@ -19,6 +19,6 @@
menuselect.makedeps
config.status
config.log
-makeopts.xml
+menuselect-tree
autom4te.cache
-muted
+makeopts.embed_rules
Propchange: team/oej/codecnegotiation/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Aug 30 06:17:34 2006
@@ -1,1 +1,1 @@
-/trunk:1-40713
+/trunk:1-41330
Modified: team/oej/codecnegotiation/.cleancount
[... 24250 lines stripped ...]
More information about the svn-commits
mailing list