[asterisk-commits] oej: branch oej/02-labarea r41004 - in
/team/oej/02-labarea: ./ agi/ apps/ bu...
asterisk-commits at lists.digium.com
asterisk-commits at lists.digium.com
Thu Aug 24 13:03:18 MST 2006
Author: oej
Date: Thu Aug 24 15:03:15 2006
New Revision: 41004
URL: http://svn.digium.com/view/asterisk?rev=41004&view=rev
Log:
reset automerge
Added:
team/oej/02-labarea/build_tools/embed_modules.xml
- copied unchanged from r40993, trunk/build_tools/embed_modules.xml
team/oej/02-labarea/doc/asterisk.8
- copied unchanged from r40993, trunk/doc/asterisk.8
team/oej/02-labarea/doc/asterisk.sgml
- copied unchanged from r40993, trunk/doc/asterisk.sgml
team/oej/02-labarea/include/asterisk/paths.h
- copied unchanged from r40993, trunk/include/asterisk/paths.h
team/oej/02-labarea/main/ (props changed)
- copied from r40993, trunk/main/
team/oej/02-labarea/main/Makefile
- copied unchanged from r40993, trunk/main/Makefile
team/oej/02-labarea/main/abstract_jb.c
- copied unchanged from r40993, trunk/main/abstract_jb.c
team/oej/02-labarea/main/acl.c
- copied unchanged from r40993, trunk/main/acl.c
team/oej/02-labarea/main/aescrypt.c
- copied unchanged from r40993, trunk/main/aescrypt.c
team/oej/02-labarea/main/aeskey.c
- copied unchanged from r40993, trunk/main/aeskey.c
team/oej/02-labarea/main/aesopt.h
- copied unchanged from r40993, trunk/main/aesopt.h
team/oej/02-labarea/main/aestab.c
- copied unchanged from r40993, trunk/main/aestab.c
team/oej/02-labarea/main/alaw.c
- copied unchanged from r40993, trunk/main/alaw.c
team/oej/02-labarea/main/app.c
- copied unchanged from r40993, trunk/main/app.c
team/oej/02-labarea/main/ast_expr2.c
- copied unchanged from r40993, trunk/main/ast_expr2.c
team/oej/02-labarea/main/ast_expr2.fl
- copied unchanged from r40993, trunk/main/ast_expr2.fl
team/oej/02-labarea/main/ast_expr2.h
- copied unchanged from r40993, trunk/main/ast_expr2.h
team/oej/02-labarea/main/ast_expr2.y
- copied unchanged from r40993, trunk/main/ast_expr2.y
team/oej/02-labarea/main/ast_expr2f.c
- copied unchanged from r40993, trunk/main/ast_expr2f.c
team/oej/02-labarea/main/asterisk.c
- copied unchanged from r40993, trunk/main/asterisk.c
team/oej/02-labarea/main/astmm.c
- copied unchanged from r40993, trunk/main/astmm.c
team/oej/02-labarea/main/autoservice.c
- copied unchanged from r40993, trunk/main/autoservice.c
team/oej/02-labarea/main/buildinfo.c
- copied unchanged from r40993, trunk/main/buildinfo.c
team/oej/02-labarea/main/callerid.c
- copied unchanged from r40993, trunk/main/callerid.c
team/oej/02-labarea/main/cdr.c
- copied unchanged from r40993, trunk/main/cdr.c
team/oej/02-labarea/main/channel.c
- copied unchanged from r40993, trunk/main/channel.c
team/oej/02-labarea/main/chanvars.c
- copied unchanged from r40993, trunk/main/chanvars.c
team/oej/02-labarea/main/cli.c
- copied unchanged from r40993, trunk/main/cli.c
team/oej/02-labarea/main/coef_in.h
- copied unchanged from r40993, trunk/main/coef_in.h
team/oej/02-labarea/main/coef_out.h
- copied unchanged from r40993, trunk/main/coef_out.h
team/oej/02-labarea/main/config.c
- copied unchanged from r40993, trunk/main/config.c
team/oej/02-labarea/main/cryptostub.c
- copied unchanged from r40993, trunk/main/cryptostub.c
team/oej/02-labarea/main/db.c
- copied unchanged from r40993, trunk/main/db.c
team/oej/02-labarea/main/db1-ast/ (props changed)
- copied from r40993, trunk/main/db1-ast/
team/oej/02-labarea/main/db1-ast/Makefile
- copied unchanged from r40993, trunk/main/db1-ast/Makefile
team/oej/02-labarea/main/db1-ast/btree/
- copied from r40993, trunk/main/db1-ast/btree/
team/oej/02-labarea/main/db1-ast/btree/bt_close.c
- copied unchanged from r40993, trunk/main/db1-ast/btree/bt_close.c
team/oej/02-labarea/main/db1-ast/btree/bt_conv.c
- copied unchanged from r40993, trunk/main/db1-ast/btree/bt_conv.c
team/oej/02-labarea/main/db1-ast/btree/bt_debug.c
- copied unchanged from r40993, trunk/main/db1-ast/btree/bt_debug.c
team/oej/02-labarea/main/db1-ast/btree/bt_delete.c
- copied unchanged from r40993, trunk/main/db1-ast/btree/bt_delete.c
team/oej/02-labarea/main/db1-ast/btree/bt_get.c
- copied unchanged from r40993, trunk/main/db1-ast/btree/bt_get.c
team/oej/02-labarea/main/db1-ast/btree/bt_open.c
- copied unchanged from r40993, trunk/main/db1-ast/btree/bt_open.c
team/oej/02-labarea/main/db1-ast/btree/bt_overflow.c
- copied unchanged from r40993, trunk/main/db1-ast/btree/bt_overflow.c
team/oej/02-labarea/main/db1-ast/btree/bt_page.c
- copied unchanged from r40993, trunk/main/db1-ast/btree/bt_page.c
team/oej/02-labarea/main/db1-ast/btree/bt_put.c
- copied unchanged from r40993, trunk/main/db1-ast/btree/bt_put.c
team/oej/02-labarea/main/db1-ast/btree/bt_search.c
- copied unchanged from r40993, trunk/main/db1-ast/btree/bt_search.c
team/oej/02-labarea/main/db1-ast/btree/bt_seq.c
- copied unchanged from r40993, trunk/main/db1-ast/btree/bt_seq.c
team/oej/02-labarea/main/db1-ast/btree/bt_split.c
- copied unchanged from r40993, trunk/main/db1-ast/btree/bt_split.c
team/oej/02-labarea/main/db1-ast/btree/bt_utils.c
- copied unchanged from r40993, trunk/main/db1-ast/btree/bt_utils.c
team/oej/02-labarea/main/db1-ast/btree/btree.h
- copied unchanged from r40993, trunk/main/db1-ast/btree/btree.h
team/oej/02-labarea/main/db1-ast/btree/extern.h
- copied unchanged from r40993, trunk/main/db1-ast/btree/extern.h
team/oej/02-labarea/main/db1-ast/db/
- copied from r40993, trunk/main/db1-ast/db/
team/oej/02-labarea/main/db1-ast/db/db.c
- copied unchanged from r40993, trunk/main/db1-ast/db/db.c
team/oej/02-labarea/main/db1-ast/hash/
- copied from r40993, trunk/main/db1-ast/hash/
team/oej/02-labarea/main/db1-ast/hash/README
- copied unchanged from r40993, trunk/main/db1-ast/hash/README
team/oej/02-labarea/main/db1-ast/hash/extern.h
- copied unchanged from r40993, trunk/main/db1-ast/hash/extern.h
team/oej/02-labarea/main/db1-ast/hash/hash.c
- copied unchanged from r40993, trunk/main/db1-ast/hash/hash.c
team/oej/02-labarea/main/db1-ast/hash/hash.h
- copied unchanged from r40993, trunk/main/db1-ast/hash/hash.h
team/oej/02-labarea/main/db1-ast/hash/hash_bigkey.c
- copied unchanged from r40993, trunk/main/db1-ast/hash/hash_bigkey.c
team/oej/02-labarea/main/db1-ast/hash/hash_buf.c
- copied unchanged from r40993, trunk/main/db1-ast/hash/hash_buf.c
team/oej/02-labarea/main/db1-ast/hash/hash_func.c
- copied unchanged from r40993, trunk/main/db1-ast/hash/hash_func.c
team/oej/02-labarea/main/db1-ast/hash/hash_log2.c
- copied unchanged from r40993, trunk/main/db1-ast/hash/hash_log2.c
team/oej/02-labarea/main/db1-ast/hash/hash_page.c
- copied unchanged from r40993, trunk/main/db1-ast/hash/hash_page.c
team/oej/02-labarea/main/db1-ast/hash/hsearch.c
- copied unchanged from r40993, trunk/main/db1-ast/hash/hsearch.c
team/oej/02-labarea/main/db1-ast/hash/ndbm.c
- copied unchanged from r40993, trunk/main/db1-ast/hash/ndbm.c
team/oej/02-labarea/main/db1-ast/hash/page.h
- copied unchanged from r40993, trunk/main/db1-ast/hash/page.h
team/oej/02-labarea/main/db1-ast/hash/search.h
- copied unchanged from r40993, trunk/main/db1-ast/hash/search.h
team/oej/02-labarea/main/db1-ast/include/
- copied from r40993, trunk/main/db1-ast/include/
team/oej/02-labarea/main/db1-ast/include/circ-queue.h
- copied unchanged from r40993, trunk/main/db1-ast/include/circ-queue.h
team/oej/02-labarea/main/db1-ast/include/compat.h
- copied unchanged from r40993, trunk/main/db1-ast/include/compat.h
team/oej/02-labarea/main/db1-ast/include/db.h
- copied unchanged from r40993, trunk/main/db1-ast/include/db.h
team/oej/02-labarea/main/db1-ast/include/mpool.h
- copied unchanged from r40993, trunk/main/db1-ast/include/mpool.h
team/oej/02-labarea/main/db1-ast/include/ndbm.h
- copied unchanged from r40993, trunk/main/db1-ast/include/ndbm.h
team/oej/02-labarea/main/db1-ast/libdb.map
- copied unchanged from r40993, trunk/main/db1-ast/libdb.map
team/oej/02-labarea/main/db1-ast/mpool/
- copied from r40993, trunk/main/db1-ast/mpool/
team/oej/02-labarea/main/db1-ast/mpool/README
- copied unchanged from r40993, trunk/main/db1-ast/mpool/README
team/oej/02-labarea/main/db1-ast/mpool/mpool.c
- copied unchanged from r40993, trunk/main/db1-ast/mpool/mpool.c
team/oej/02-labarea/main/db1-ast/recno/
- copied from r40993, trunk/main/db1-ast/recno/
team/oej/02-labarea/main/db1-ast/recno/extern.h
- copied unchanged from r40993, trunk/main/db1-ast/recno/extern.h
team/oej/02-labarea/main/db1-ast/recno/rec_close.c
- copied unchanged from r40993, trunk/main/db1-ast/recno/rec_close.c
team/oej/02-labarea/main/db1-ast/recno/rec_delete.c
- copied unchanged from r40993, trunk/main/db1-ast/recno/rec_delete.c
team/oej/02-labarea/main/db1-ast/recno/rec_get.c
- copied unchanged from r40993, trunk/main/db1-ast/recno/rec_get.c
team/oej/02-labarea/main/db1-ast/recno/rec_open.c
- copied unchanged from r40993, trunk/main/db1-ast/recno/rec_open.c
team/oej/02-labarea/main/db1-ast/recno/rec_put.c
- copied unchanged from r40993, trunk/main/db1-ast/recno/rec_put.c
team/oej/02-labarea/main/db1-ast/recno/rec_search.c
- copied unchanged from r40993, trunk/main/db1-ast/recno/rec_search.c
team/oej/02-labarea/main/db1-ast/recno/rec_seq.c
- copied unchanged from r40993, trunk/main/db1-ast/recno/rec_seq.c
team/oej/02-labarea/main/db1-ast/recno/rec_utils.c
- copied unchanged from r40993, trunk/main/db1-ast/recno/rec_utils.c
team/oej/02-labarea/main/db1-ast/recno/recno.h
- copied unchanged from r40993, trunk/main/db1-ast/recno/recno.h
team/oej/02-labarea/main/devicestate.c
- copied unchanged from r40993, trunk/main/devicestate.c
team/oej/02-labarea/main/dlfcn.c
- copied unchanged from r40993, trunk/main/dlfcn.c
team/oej/02-labarea/main/dns.c
- copied unchanged from r40993, trunk/main/dns.c
team/oej/02-labarea/main/dnsmgr.c
- copied unchanged from r40993, trunk/main/dnsmgr.c
team/oej/02-labarea/main/dsp.c
- copied unchanged from r40993, trunk/main/dsp.c
team/oej/02-labarea/main/ecdisa.h
- copied unchanged from r40993, trunk/main/ecdisa.h
team/oej/02-labarea/main/editline/ (props changed)
- copied from r40993, trunk/main/editline/
team/oej/02-labarea/main/editline/CHANGES
- copied unchanged from r40993, trunk/main/editline/CHANGES
team/oej/02-labarea/main/editline/INSTALL
- copied unchanged from r40993, trunk/main/editline/INSTALL
team/oej/02-labarea/main/editline/Makefile.in
- copied unchanged from r40993, trunk/main/editline/Makefile.in
team/oej/02-labarea/main/editline/PLATFORMS
- copied unchanged from r40993, trunk/main/editline/PLATFORMS
team/oej/02-labarea/main/editline/README
- copied unchanged from r40993, trunk/main/editline/README
team/oej/02-labarea/main/editline/TEST/
- copied from r40993, trunk/main/editline/TEST/
team/oej/02-labarea/main/editline/TEST/test.c
- copied unchanged from r40993, trunk/main/editline/TEST/test.c
team/oej/02-labarea/main/editline/chared.c
- copied unchanged from r40993, trunk/main/editline/chared.c
team/oej/02-labarea/main/editline/chared.h
- copied unchanged from r40993, trunk/main/editline/chared.h
team/oej/02-labarea/main/editline/common.c
- copied unchanged from r40993, trunk/main/editline/common.c
team/oej/02-labarea/main/editline/config.guess
- copied unchanged from r40993, trunk/main/editline/config.guess
team/oej/02-labarea/main/editline/config.h.in
- copied unchanged from r40993, trunk/main/editline/config.h.in
team/oej/02-labarea/main/editline/config.sub
- copied unchanged from r40993, trunk/main/editline/config.sub
team/oej/02-labarea/main/editline/configure
- copied unchanged from r40993, trunk/main/editline/configure
team/oej/02-labarea/main/editline/configure.in
- copied unchanged from r40993, trunk/main/editline/configure.in
team/oej/02-labarea/main/editline/editline.3
- copied unchanged from r40993, trunk/main/editline/editline.3
team/oej/02-labarea/main/editline/editrc.5
- copied unchanged from r40993, trunk/main/editline/editrc.5
team/oej/02-labarea/main/editline/el.c
- copied unchanged from r40993, trunk/main/editline/el.c
team/oej/02-labarea/main/editline/el.h
- copied unchanged from r40993, trunk/main/editline/el.h
team/oej/02-labarea/main/editline/emacs.c
- copied unchanged from r40993, trunk/main/editline/emacs.c
team/oej/02-labarea/main/editline/hist.c
- copied unchanged from r40993, trunk/main/editline/hist.c
team/oej/02-labarea/main/editline/hist.h
- copied unchanged from r40993, trunk/main/editline/hist.h
team/oej/02-labarea/main/editline/histedit.h
- copied unchanged from r40993, trunk/main/editline/histedit.h
team/oej/02-labarea/main/editline/history.c
- copied unchanged from r40993, trunk/main/editline/history.c
team/oej/02-labarea/main/editline/install-sh
- copied unchanged from r40993, trunk/main/editline/install-sh
team/oej/02-labarea/main/editline/key.c
- copied unchanged from r40993, trunk/main/editline/key.c
team/oej/02-labarea/main/editline/key.h
- copied unchanged from r40993, trunk/main/editline/key.h
team/oej/02-labarea/main/editline/makelist
- copied unchanged from r40993, trunk/main/editline/makelist
team/oej/02-labarea/main/editline/map.c
- copied unchanged from r40993, trunk/main/editline/map.c
team/oej/02-labarea/main/editline/map.h
- copied unchanged from r40993, trunk/main/editline/map.h
team/oej/02-labarea/main/editline/np/ (props changed)
- copied from r40993, trunk/main/editline/np/
team/oej/02-labarea/main/editline/np/fgetln.c
- copied unchanged from r40993, trunk/main/editline/np/fgetln.c
team/oej/02-labarea/main/editline/np/strlcat.c
- copied unchanged from r40993, trunk/main/editline/np/strlcat.c
team/oej/02-labarea/main/editline/np/strlcpy.c
- copied unchanged from r40993, trunk/main/editline/np/strlcpy.c
team/oej/02-labarea/main/editline/np/unvis.c
- copied unchanged from r40993, trunk/main/editline/np/unvis.c
team/oej/02-labarea/main/editline/np/vis.c
- copied unchanged from r40993, trunk/main/editline/np/vis.c
team/oej/02-labarea/main/editline/np/vis.h
- copied unchanged from r40993, trunk/main/editline/np/vis.h
team/oej/02-labarea/main/editline/parse.c
- copied unchanged from r40993, trunk/main/editline/parse.c
team/oej/02-labarea/main/editline/parse.h
- copied unchanged from r40993, trunk/main/editline/parse.h
team/oej/02-labarea/main/editline/prompt.c
- copied unchanged from r40993, trunk/main/editline/prompt.c
team/oej/02-labarea/main/editline/prompt.h
- copied unchanged from r40993, trunk/main/editline/prompt.h
team/oej/02-labarea/main/editline/read.c
- copied unchanged from r40993, trunk/main/editline/read.c
team/oej/02-labarea/main/editline/read.h
- copied unchanged from r40993, trunk/main/editline/read.h
team/oej/02-labarea/main/editline/readline/
- copied from r40993, trunk/main/editline/readline/
team/oej/02-labarea/main/editline/readline.c
- copied unchanged from r40993, trunk/main/editline/readline.c
team/oej/02-labarea/main/editline/readline/readline.h
- copied unchanged from r40993, trunk/main/editline/readline/readline.h
team/oej/02-labarea/main/editline/refresh.c
- copied unchanged from r40993, trunk/main/editline/refresh.c
team/oej/02-labarea/main/editline/refresh.h
- copied unchanged from r40993, trunk/main/editline/refresh.h
team/oej/02-labarea/main/editline/search.c
- copied unchanged from r40993, trunk/main/editline/search.c
team/oej/02-labarea/main/editline/search.h
- copied unchanged from r40993, trunk/main/editline/search.h
team/oej/02-labarea/main/editline/sig.c
- copied unchanged from r40993, trunk/main/editline/sig.c
team/oej/02-labarea/main/editline/sig.h
- copied unchanged from r40993, trunk/main/editline/sig.h
team/oej/02-labarea/main/editline/sys.h
- copied unchanged from r40993, trunk/main/editline/sys.h
team/oej/02-labarea/main/editline/term.c
- copied unchanged from r40993, trunk/main/editline/term.c
team/oej/02-labarea/main/editline/term.h
- copied unchanged from r40993, trunk/main/editline/term.h
team/oej/02-labarea/main/editline/tokenizer.c
- copied unchanged from r40993, trunk/main/editline/tokenizer.c
team/oej/02-labarea/main/editline/tokenizer.h
- copied unchanged from r40993, trunk/main/editline/tokenizer.h
team/oej/02-labarea/main/editline/tty.c
- copied unchanged from r40993, trunk/main/editline/tty.c
team/oej/02-labarea/main/editline/tty.h
- copied unchanged from r40993, trunk/main/editline/tty.h
team/oej/02-labarea/main/editline/vi.c
- copied unchanged from r40993, trunk/main/editline/vi.c
team/oej/02-labarea/main/enum.c
- copied unchanged from r40993, trunk/main/enum.c
team/oej/02-labarea/main/file.c
- copied unchanged from r40993, trunk/main/file.c
team/oej/02-labarea/main/fixedjitterbuf.c
- copied unchanged from r40993, trunk/main/fixedjitterbuf.c
team/oej/02-labarea/main/fixedjitterbuf.h
- copied unchanged from r40993, trunk/main/fixedjitterbuf.h
team/oej/02-labarea/main/frame.c
- copied unchanged from r40993, trunk/main/frame.c
team/oej/02-labarea/main/fskmodem.c
- copied unchanged from r40993, trunk/main/fskmodem.c
team/oej/02-labarea/main/http.c
- copied unchanged from r40993, trunk/main/http.c
team/oej/02-labarea/main/image.c
- copied unchanged from r40993, trunk/main/image.c
team/oej/02-labarea/main/indications.c
- copied unchanged from r40993, trunk/main/indications.c
team/oej/02-labarea/main/io.c
- copied unchanged from r40993, trunk/main/io.c
team/oej/02-labarea/main/jitterbuf.c
- copied unchanged from r40993, trunk/main/jitterbuf.c
team/oej/02-labarea/main/jitterbuf.h
- copied unchanged from r40993, trunk/main/jitterbuf.h
team/oej/02-labarea/main/loader.c
- copied unchanged from r40993, trunk/main/loader.c
team/oej/02-labarea/main/logger.c
- copied unchanged from r40993, trunk/main/logger.c
team/oej/02-labarea/main/manager.c
- copied unchanged from r40993, trunk/main/manager.c
team/oej/02-labarea/main/md5.c
- copied unchanged from r40993, trunk/main/md5.c
team/oej/02-labarea/main/netsock.c
- copied unchanged from r40993, trunk/main/netsock.c
team/oej/02-labarea/main/pbx.c
- copied unchanged from r40993, trunk/main/pbx.c
team/oej/02-labarea/main/plc.c
- copied unchanged from r40993, trunk/main/plc.c
team/oej/02-labarea/main/poll.c
- copied unchanged from r40993, trunk/main/poll.c
team/oej/02-labarea/main/privacy.c
- copied unchanged from r40993, trunk/main/privacy.c
team/oej/02-labarea/main/rtp.c
- copied unchanged from r40993, trunk/main/rtp.c
team/oej/02-labarea/main/say.c
- copied unchanged from r40993, trunk/main/say.c
team/oej/02-labarea/main/sched.c
- copied unchanged from r40993, trunk/main/sched.c
team/oej/02-labarea/main/sha1.c
- copied unchanged from r40993, trunk/main/sha1.c
team/oej/02-labarea/main/slinfactory.c
- copied unchanged from r40993, trunk/main/slinfactory.c
team/oej/02-labarea/main/srv.c
- copied unchanged from r40993, trunk/main/srv.c
team/oej/02-labarea/main/stdtime/ (props changed)
- copied from r40993, trunk/main/stdtime/
team/oej/02-labarea/main/stdtime/Makefile
- copied unchanged from r40993, trunk/main/stdtime/Makefile
team/oej/02-labarea/main/stdtime/localtime.c
- copied unchanged from r40993, trunk/main/stdtime/localtime.c
team/oej/02-labarea/main/stdtime/test.c
- copied unchanged from r40993, trunk/main/stdtime/test.c
team/oej/02-labarea/main/stdtime/tzfile.h
- copied unchanged from r40993, trunk/main/stdtime/tzfile.h
team/oej/02-labarea/main/strcompat.c
- copied unchanged from r40993, trunk/main/strcompat.c
team/oej/02-labarea/main/tdd.c
- copied unchanged from r40993, trunk/main/tdd.c
team/oej/02-labarea/main/term.c
- copied unchanged from r40993, trunk/main/term.c
team/oej/02-labarea/main/translate.c
- copied unchanged from r40993, trunk/main/translate.c
team/oej/02-labarea/main/udptl.c
- copied unchanged from r40993, trunk/main/udptl.c
team/oej/02-labarea/main/ulaw.c
- copied unchanged from r40993, trunk/main/ulaw.c
team/oej/02-labarea/main/utils.c
- copied unchanged from r40993, trunk/main/utils.c
team/oej/02-labarea/utils/muted.c
- copied unchanged from r40993, trunk/utils/muted.c
Removed:
team/oej/02-labarea/abstract_jb.c
team/oej/02-labarea/acl.c
team/oej/02-labarea/aescrypt.c
team/oej/02-labarea/aeskey.c
team/oej/02-labarea/aesopt.h
team/oej/02-labarea/aestab.c
team/oej/02-labarea/alaw.c
team/oej/02-labarea/app.c
team/oej/02-labarea/ast_expr2.c
team/oej/02-labarea/ast_expr2.fl
team/oej/02-labarea/ast_expr2.h
team/oej/02-labarea/ast_expr2.y
team/oej/02-labarea/ast_expr2f.c
team/oej/02-labarea/asterisk.8
team/oej/02-labarea/asterisk.c
team/oej/02-labarea/asterisk.sgml
team/oej/02-labarea/astmm.c
team/oej/02-labarea/autoservice.c
team/oej/02-labarea/buildinfo.c
team/oej/02-labarea/callerid.c
team/oej/02-labarea/cdr.c
team/oej/02-labarea/channel.c
team/oej/02-labarea/chanvars.c
team/oej/02-labarea/cli.c
team/oej/02-labarea/coef_in.h
team/oej/02-labarea/coef_out.h
team/oej/02-labarea/config.c
team/oej/02-labarea/cryptostub.c
team/oej/02-labarea/cygwin/
team/oej/02-labarea/db.c
team/oej/02-labarea/db1-ast/
team/oej/02-labarea/devicestate.c
team/oej/02-labarea/dlfcn.c
team/oej/02-labarea/dns.c
team/oej/02-labarea/dnsmgr.c
team/oej/02-labarea/dsp.c
team/oej/02-labarea/ecdisa.h
team/oej/02-labarea/editline/
team/oej/02-labarea/enum.c
team/oej/02-labarea/file.c
team/oej/02-labarea/fixedjitterbuf.c
team/oej/02-labarea/fixedjitterbuf.h
team/oej/02-labarea/frame.c
team/oej/02-labarea/fskmodem.c
team/oej/02-labarea/http.c
team/oej/02-labarea/image.c
team/oej/02-labarea/indications.c
team/oej/02-labarea/io.c
team/oej/02-labarea/jitterbuf.c
team/oej/02-labarea/jitterbuf.h
team/oej/02-labarea/loader.c
team/oej/02-labarea/logger.c
team/oej/02-labarea/manager.c
team/oej/02-labarea/md5.c
team/oej/02-labarea/muted.c
team/oej/02-labarea/netsock.c
team/oej/02-labarea/pbx.c
team/oej/02-labarea/plc.c
team/oej/02-labarea/poll.c
team/oej/02-labarea/privacy.c
team/oej/02-labarea/rtp.c
team/oej/02-labarea/say.c
team/oej/02-labarea/sched.c
team/oej/02-labarea/sha1.c
team/oej/02-labarea/slinfactory.c
team/oej/02-labarea/sounds.txt
team/oej/02-labarea/srv.c
team/oej/02-labarea/stdtime/
team/oej/02-labarea/strcompat.c
team/oej/02-labarea/tdd.c
team/oej/02-labarea/term.c
team/oej/02-labarea/translate.c
team/oej/02-labarea/udptl.c
team/oej/02-labarea/ulaw.c
team/oej/02-labarea/utils.c
Modified:
team/oej/02-labarea/ (props changed)
team/oej/02-labarea/.cleancount
team/oej/02-labarea/Makefile
team/oej/02-labarea/Makefile.moddir_rules
team/oej/02-labarea/Makefile.rules
team/oej/02-labarea/UPGRADE.txt
team/oej/02-labarea/acinclude.m4
team/oej/02-labarea/agi/Makefile
team/oej/02-labarea/apps/ (props changed)
team/oej/02-labarea/apps/Makefile
team/oej/02-labarea/apps/app_adsiprog.c
team/oej/02-labarea/apps/app_alarmreceiver.c
team/oej/02-labarea/apps/app_amd.c
team/oej/02-labarea/apps/app_authenticate.c
team/oej/02-labarea/apps/app_cdr.c
team/oej/02-labarea/apps/app_chanisavail.c
team/oej/02-labarea/apps/app_channelredirect.c
team/oej/02-labarea/apps/app_chanspy.c
team/oej/02-labarea/apps/app_controlplayback.c
team/oej/02-labarea/apps/app_db.c
team/oej/02-labarea/apps/app_dial.c
team/oej/02-labarea/apps/app_dictate.c
team/oej/02-labarea/apps/app_directed_pickup.c
team/oej/02-labarea/apps/app_directory.c
team/oej/02-labarea/apps/app_disa.c
team/oej/02-labarea/apps/app_dumpchan.c
team/oej/02-labarea/apps/app_echo.c
team/oej/02-labarea/apps/app_exec.c
team/oej/02-labarea/apps/app_externalivr.c
team/oej/02-labarea/apps/app_festival.c
team/oej/02-labarea/apps/app_flash.c
team/oej/02-labarea/apps/app_followme.c
team/oej/02-labarea/apps/app_forkcdr.c
team/oej/02-labarea/apps/app_getcpeid.c
team/oej/02-labarea/apps/app_hasnewvoicemail.c
team/oej/02-labarea/apps/app_ices.c
team/oej/02-labarea/apps/app_image.c
team/oej/02-labarea/apps/app_ivrdemo.c
team/oej/02-labarea/apps/app_lookupblacklist.c
team/oej/02-labarea/apps/app_lookupcidname.c
team/oej/02-labarea/apps/app_macro.c
team/oej/02-labarea/apps/app_meetme.c
team/oej/02-labarea/apps/app_milliwatt.c
team/oej/02-labarea/apps/app_mixmonitor.c
team/oej/02-labarea/apps/app_morsecode.c
team/oej/02-labarea/apps/app_mp3.c
team/oej/02-labarea/apps/app_nbscat.c
team/oej/02-labarea/apps/app_osplookup.c
team/oej/02-labarea/apps/app_page.c
team/oej/02-labarea/apps/app_parkandannounce.c
team/oej/02-labarea/apps/app_playback.c
team/oej/02-labarea/apps/app_privacy.c
team/oej/02-labarea/apps/app_queue.c
team/oej/02-labarea/apps/app_random.c
team/oej/02-labarea/apps/app_read.c
team/oej/02-labarea/apps/app_readfile.c
team/oej/02-labarea/apps/app_realtime.c
team/oej/02-labarea/apps/app_record.c
team/oej/02-labarea/apps/app_rpt.c
team/oej/02-labarea/apps/app_sayunixtime.c
team/oej/02-labarea/apps/app_senddtmf.c
team/oej/02-labarea/apps/app_sendtext.c
team/oej/02-labarea/apps/app_setcallerid.c
team/oej/02-labarea/apps/app_setcdruserfield.c
team/oej/02-labarea/apps/app_settransfercapability.c
team/oej/02-labarea/apps/app_skel.c
team/oej/02-labarea/apps/app_sms.c
team/oej/02-labarea/apps/app_softhangup.c
team/oej/02-labarea/apps/app_speech_utils.c
team/oej/02-labarea/apps/app_stack.c
team/oej/02-labarea/apps/app_system.c
team/oej/02-labarea/apps/app_talkdetect.c
team/oej/02-labarea/apps/app_test.c
team/oej/02-labarea/apps/app_transfer.c
team/oej/02-labarea/apps/app_url.c
team/oej/02-labarea/apps/app_userevent.c
team/oej/02-labarea/apps/app_verbose.c
team/oej/02-labarea/apps/app_voicemail.c
team/oej/02-labarea/apps/app_waitforring.c
team/oej/02-labarea/apps/app_waitforsilence.c
team/oej/02-labarea/apps/app_while.c
team/oej/02-labarea/apps/app_zapateller.c
team/oej/02-labarea/apps/app_zapbarge.c
team/oej/02-labarea/apps/app_zapras.c
team/oej/02-labarea/apps/app_zapscan.c
team/oej/02-labarea/build_tools/cflags.xml
team/oej/02-labarea/build_tools/make_version
team/oej/02-labarea/build_tools/menuselect-deps.in
team/oej/02-labarea/build_tools/mkpkgconfig
team/oej/02-labarea/build_tools/prep_moduledeps
team/oej/02-labarea/cdr/ (props changed)
team/oej/02-labarea/cdr/Makefile
team/oej/02-labarea/cdr/cdr_csv.c
team/oej/02-labarea/cdr/cdr_custom.c
team/oej/02-labarea/cdr/cdr_manager.c
team/oej/02-labarea/cdr/cdr_odbc.c
team/oej/02-labarea/cdr/cdr_pgsql.c
team/oej/02-labarea/cdr/cdr_radius.c
team/oej/02-labarea/cdr/cdr_sqlite.c
team/oej/02-labarea/cdr/cdr_tds.c
team/oej/02-labarea/channels/ (props changed)
team/oej/02-labarea/channels/Makefile
team/oej/02-labarea/channels/chan_agent.c
team/oej/02-labarea/channels/chan_alsa.c
team/oej/02-labarea/channels/chan_features.c
team/oej/02-labarea/channels/chan_h323.c
team/oej/02-labarea/channels/chan_iax2.c
team/oej/02-labarea/channels/chan_jingle.c
team/oej/02-labarea/channels/chan_local.c
team/oej/02-labarea/channels/chan_mgcp.c
team/oej/02-labarea/channels/chan_misdn.c
team/oej/02-labarea/channels/chan_nbs.c
team/oej/02-labarea/channels/chan_oss.c
team/oej/02-labarea/channels/chan_phone.c
team/oej/02-labarea/channels/chan_sip.c
team/oej/02-labarea/channels/chan_skinny.c
team/oej/02-labarea/channels/chan_zap.c
team/oej/02-labarea/channels/h323/Makefile
team/oej/02-labarea/channels/misdn/Makefile
team/oej/02-labarea/channels/misdn/ie.c
team/oej/02-labarea/channels/misdn/isdn_lib.c
team/oej/02-labarea/channels/misdn/isdn_lib.h
team/oej/02-labarea/channels/misdn/isdn_lib_intern.h
team/oej/02-labarea/channels/misdn/isdn_msg_parser.c
team/oej/02-labarea/codecs/ (props changed)
team/oej/02-labarea/codecs/Makefile
team/oej/02-labarea/codecs/codec_a_mu.c
team/oej/02-labarea/codecs/codec_adpcm.c
team/oej/02-labarea/codecs/codec_alaw.c
team/oej/02-labarea/codecs/codec_g726.c
team/oej/02-labarea/codecs/codec_gsm.c
team/oej/02-labarea/codecs/codec_ilbc.c
team/oej/02-labarea/codecs/codec_lpc10.c
team/oej/02-labarea/codecs/codec_speex.c
team/oej/02-labarea/codecs/codec_ulaw.c
team/oej/02-labarea/codecs/codec_zap.c
team/oej/02-labarea/codecs/gsm/Makefile
team/oej/02-labarea/configs/zapata.conf.sample
team/oej/02-labarea/configure
team/oej/02-labarea/configure.ac
team/oej/02-labarea/contrib/asterisk-ng-doxygen
team/oej/02-labarea/doc/queues-with-callback-members.txt
team/oej/02-labarea/doc/speechrec.txt
team/oej/02-labarea/formats/ (props changed)
team/oej/02-labarea/formats/Makefile
team/oej/02-labarea/formats/format_g723.c
team/oej/02-labarea/formats/format_g726.c
team/oej/02-labarea/formats/format_g729.c
team/oej/02-labarea/formats/format_gsm.c
team/oej/02-labarea/formats/format_h263.c
team/oej/02-labarea/formats/format_h264.c
team/oej/02-labarea/formats/format_ilbc.c
team/oej/02-labarea/formats/format_jpeg.c
team/oej/02-labarea/formats/format_ogg_vorbis.c
team/oej/02-labarea/formats/format_pcm.c
team/oej/02-labarea/formats/format_sln.c
team/oej/02-labarea/formats/format_vox.c
team/oej/02-labarea/formats/format_wav.c
team/oej/02-labarea/formats/format_wav_gsm.c
team/oej/02-labarea/funcs/ (props changed)
team/oej/02-labarea/funcs/Makefile
team/oej/02-labarea/funcs/func_base64.c
team/oej/02-labarea/funcs/func_callerid.c
team/oej/02-labarea/funcs/func_cdr.c
team/oej/02-labarea/funcs/func_channel.c
team/oej/02-labarea/funcs/func_curl.c
team/oej/02-labarea/funcs/func_cut.c
team/oej/02-labarea/funcs/func_db.c
team/oej/02-labarea/funcs/func_enum.c
team/oej/02-labarea/funcs/func_env.c
team/oej/02-labarea/funcs/func_global.c
team/oej/02-labarea/funcs/func_groupcount.c
team/oej/02-labarea/funcs/func_language.c
team/oej/02-labarea/funcs/func_logic.c
team/oej/02-labarea/funcs/func_math.c
team/oej/02-labarea/funcs/func_md5.c
team/oej/02-labarea/funcs/func_moh.c
team/oej/02-labarea/funcs/func_odbc.c
team/oej/02-labarea/funcs/func_rand.c
team/oej/02-labarea/funcs/func_realtime.c
team/oej/02-labarea/funcs/func_sha1.c
team/oej/02-labarea/funcs/func_strings.c
team/oej/02-labarea/funcs/func_timeout.c
team/oej/02-labarea/funcs/func_uri.c
team/oej/02-labarea/include/asterisk.h
team/oej/02-labarea/include/asterisk/abstract_jb.h
team/oej/02-labarea/include/asterisk/autoconfig.h.in
team/oej/02-labarea/include/asterisk/cdr.h
team/oej/02-labarea/include/asterisk/compiler.h
team/oej/02-labarea/include/asterisk/dns.h
team/oej/02-labarea/include/asterisk/file.h
team/oej/02-labarea/include/asterisk/indications.h
team/oej/02-labarea/include/asterisk/linkedlists.h
team/oej/02-labarea/include/asterisk/lock.h
team/oej/02-labarea/include/asterisk/module.h
team/oej/02-labarea/include/asterisk/monitor.h
team/oej/02-labarea/include/asterisk/srv.h
team/oej/02-labarea/include/asterisk/translate.h
team/oej/02-labarea/include/asterisk/utils.h
team/oej/02-labarea/makeopts.in
team/oej/02-labarea/pbx/ (props changed)
team/oej/02-labarea/pbx/Makefile
team/oej/02-labarea/pbx/pbx_ael.c
team/oej/02-labarea/pbx/pbx_config.c
team/oej/02-labarea/pbx/pbx_dundi.c
team/oej/02-labarea/pbx/pbx_loopback.c
team/oej/02-labarea/pbx/pbx_realtime.c
team/oej/02-labarea/pbx/pbx_spool.c
team/oej/02-labarea/res/ (props changed)
team/oej/02-labarea/res/Makefile
team/oej/02-labarea/res/res_adsi.c
team/oej/02-labarea/res/res_agi.c
team/oej/02-labarea/res/res_clioriginate.c
team/oej/02-labarea/res/res_config_odbc.c
team/oej/02-labarea/res/res_config_pgsql.c
team/oej/02-labarea/res/res_convert.c
team/oej/02-labarea/res/res_crypto.c
team/oej/02-labarea/res/res_features.c
team/oej/02-labarea/res/res_indications.c
team/oej/02-labarea/res/res_jabber.c
team/oej/02-labarea/res/res_monitor.c
team/oej/02-labarea/res/res_musiconhold.c
team/oej/02-labarea/res/res_odbc.c
team/oej/02-labarea/res/res_smdi.c
team/oej/02-labarea/res/res_snmp.c
team/oej/02-labarea/res/res_speech.c
team/oej/02-labarea/sounds/Makefile
team/oej/02-labarea/utils/ (props changed)
team/oej/02-labarea/utils/Makefile
team/oej/02-labarea/utils/ael_main.c
Propchange: team/oej/02-labarea/
------------------------------------------------------------------------------
automerge = http://edvina.net/training/
Propchange: team/oej/02-labarea/
------------------------------------------------------------------------------
Binary property 'branch-1.2-blocked' - no diff available.
Propchange: team/oej/02-labarea/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.
Propchange: team/oej/02-labarea/
------------------------------------------------------------------------------
--- svn:externals (original)
+++ svn:externals Thu Aug 24 15:03:15 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/02-labarea/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Aug 24 15:03:15 2006
@@ -19,6 +19,6 @@
menuselect.makedeps
config.status
config.log
-makeopts.xml
+menuselect-tree
autom4te.cache
-muted
+makeopts.embed_rules
Propchange: team/oej/02-labarea/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Aug 24 15:03:15 2006
@@ -1,1 +1,1 @@
-/trunk:1-40710
+/trunk:1-40994
Modified: team/oej/02-labarea/.cleancount
URL: http://svn.digium.com/view/asterisk/team/oej/02-labarea/.cleancount?rev=41004&r1=41003&r2=41004&view=diff
==============================================================================
--- team/oej/02-labarea/.cleancount (original)
+++ team/oej/02-labarea/.cleancount Thu Aug 24 15:03:15 2006
@@ -1,1 +1,1 @@
-21
+22
Modified: team/oej/02-labarea/Makefile
URL: http://svn.digium.com/view/asterisk/team/oej/02-labarea/Makefile?rev=41004&r1=41003&r2=41004&view=diff
==============================================================================
--- team/oej/02-labarea/Makefile (original)
+++ team/oej/02-labarea/Makefile Thu Aug 24 15:03:15 2006
@@ -22,32 +22,15 @@
.EXPORT_ALL_VARIABLES:
+include makeopts
+
#Uncomment this to see all build commands instead of 'quiet' output
#NOISY_BUILD=yes
# Create OPTIONS variable
OPTIONS=
-# If cross compiling, define these to suit
-#CROSS_COMPILE=/opt/montavista/pro/devkit/arm/xscale_be/bin/xscale_be-
-#CROSS_COMPILE_BIN=/opt/montavista/pro/devkit/arm/xscale_be/bin/
-#CROSS_COMPILE_TARGET=/opt/montavista/pro/devkit/arm/xscale_be/target
-#CROSS_ARCH=Linux
-#CROSS_PROC=arm
-#SUB_PROC=xscale # or maverick
-
-ifeq ($(CROSS_COMPILE),)
- OSARCH:=$(shell uname -s)
- PROC?:=$(shell uname -m)
-else
- OSARCH=$(CROSS_ARCH)
- PROC=$(CROSS_PROC)
-endif
-
ASTTOPDIR:=$(shell pwd)
-
-# Remember the MAKELEVEL at the top
-MAKETOPLEVEL?=$(MAKELEVEL)
# Overwite config files on "make samples"
OVERWRITE=y
@@ -60,20 +43,7 @@
# For example, make DESTDIR=/tmp/asterisk woud put things in
# /tmp/asterisk/etc/asterisk
# !!! Watch out, put no spaces or comments after the value !!!
-DESTDIR?=
#DESTDIR?=/tmp/asterisk
-
-# Original busydetect routine
-#BUSYDETECT = -DBUSYDETECT
-
-# Improved busydetect routine, comment the previous one if you use this one
-#BUSYDETECT+= -DBUSYDETECT_MARTIN
-# Detect the busy signal looking only at tone lengths
-# For example if you have 3 beeps 100ms tone, 100ms silence separated by 500 ms of silence
-#BUSYDETECT+= -DBUSYDETECT_TONEONLY
-# Enforce the detection of busy signal (get rid of false hangups)
-# Don't use together with -DBUSYDETECT_TONEONLY
-#BUSYDETECT+= -DBUSYDETECT_COMPARE_TONE_AND_SILENCE
# Define standard directories for various platforms
# These apply if they are not redefined in asterisk.conf
@@ -131,59 +101,10 @@
GLOBAL_MAKEOPTS=$(wildcard /etc/asterisk.makeopts)
USER_MAKEOPTS=$(wildcard ~/.asterisk.makeopts)
-ifeq ($(strip $(foreach var,clean distclean dist-clean update,$(findstring $(var),$(MAKECMDGOALS)))),)
- ifneq ($(wildcard menuselect.makeopts),)
- include menuselect.makeopts
- include menuselect.makedeps
- endif
-endif
-
-ifeq ($(strip $(foreach var,clean distclean dist-clean update,$(findstring $(var),$(MAKECMDGOALS)))),)
- ifneq ($(wildcard makeopts),)
- include makeopts
- endif
-endif
-
-TOPDIR_CFLAGS=-Iinclude
-MOD_SUBDIR_CFLAGS=-I../include -I..
-OTHER_SUBDIR_CFLAGS=-I../include -I..
-
-ifeq ($(origin MENUSELECT_CFLAGS),undefined)
- MENUSELECT_CFLAGS:=$(shell grep MENUSELECT_CFLAGS $(USER_MAKEOPTS) .)
- ifeq ($(MENUSELECT_CFLAGS),)
- MENUSELECT_CFLAGS:=$(shell grep MENUSELECT_CFLAGS $(GLOBAL_MAKEOPTS) .)
- endif
- ifneq ($(MENUSELECT_CFLAGS),)
- MENUSELECT_CFLAGS:=$(shell echo $(MENUSELECT_CFLAGS) | cut -f2 -d'=')
- endif
-endif
-
-ifeq ($(findstring dont-optimize,$(MAKECMDGOALS)),$(findstring DONT_OPTIMIZE,$(MENUSELECT_CFLAGS)))
-# More GSM codec optimization
-# Uncomment to enable MMXTM optimizations for x86 architecture CPU's
-# which support MMX instructions. This should be newer pentiums,
-# ppro's, etc, as well as the AMD K6 and K7.
-#K6OPT = -DK6OPT
-
-# Tell gcc to optimize the code
-OPTIMIZE+=-O6
-else
- # Stack backtraces, while useful for debugging, are incompatible with optimizations
- ifeq ($(OSARCH),Linux)
- CFLAGS+=-DSTACK_BACKTRACES
- endif
-endif
-
-# *CLI> show memory allocations [filename]
-# *CLI> show memory summary [filename]
-ifneq ($(findstring MALLOC_DEBUG,$(MENUSELECT_CFLAGS)),)
- TOPDIR_CFLAGS+=-include include/asterisk/astmm.h
- MOD_SUBDIR_CFLAGS+=-include ../include/asterisk/astmm.h
-endif
-
-MOD_SUBDIR_CFLAGS+=-fPIC
-
-ifeq ($(OSARCH),Linux)
+MOD_SUBDIR_CFLAGS=-I../include -I../main
+OTHER_SUBDIR_CFLAGS=-I../include
+
[... 22266 lines stripped ...]
More information about the asterisk-commits
mailing list