[asterisk-commits] oej: branch oej/callpickup r40843 - in /team/oej/callpickup: ./ agi/ apps/ bu...

asterisk-commits at lists.digium.com asterisk-commits at lists.digium.com
Tue Aug 22 11:18:56 MST 2006 

Author: oej
Date: Tue Aug 22 13:18:54 2006
New Revision: 40843

URL: http://svn.digium.com/view/asterisk?rev=40843&view=rev
Log:
Resetting automerge

Added:
    team/oej/callpickup/build_tools/embed_modules.xml
      - copied unchanged from r40837, trunk/build_tools/embed_modules.xml
    team/oej/callpickup/doc/asterisk.8
      - copied unchanged from r40837, trunk/doc/asterisk.8
    team/oej/callpickup/doc/asterisk.sgml
      - copied unchanged from r40837, trunk/doc/asterisk.sgml
    team/oej/callpickup/main/   (props changed)
      - copied from r40837, trunk/main/
    team/oej/callpickup/main/Makefile
      - copied unchanged from r40837, trunk/main/Makefile
    team/oej/callpickup/main/abstract_jb.c
      - copied unchanged from r40837, trunk/main/abstract_jb.c
    team/oej/callpickup/main/acl.c
      - copied unchanged from r40837, trunk/main/acl.c
    team/oej/callpickup/main/aescrypt.c
      - copied unchanged from r40837, trunk/main/aescrypt.c
    team/oej/callpickup/main/aeskey.c
      - copied unchanged from r40837, trunk/main/aeskey.c
    team/oej/callpickup/main/aesopt.h
      - copied unchanged from r40837, trunk/main/aesopt.h
    team/oej/callpickup/main/aestab.c
      - copied unchanged from r40837, trunk/main/aestab.c
    team/oej/callpickup/main/alaw.c
      - copied unchanged from r40837, trunk/main/alaw.c
    team/oej/callpickup/main/app.c
      - copied unchanged from r40837, trunk/main/app.c
    team/oej/callpickup/main/ast_expr2.c
      - copied unchanged from r40837, trunk/main/ast_expr2.c
    team/oej/callpickup/main/ast_expr2.fl
      - copied unchanged from r40837, trunk/main/ast_expr2.fl
    team/oej/callpickup/main/ast_expr2.h
      - copied unchanged from r40837, trunk/main/ast_expr2.h
    team/oej/callpickup/main/ast_expr2.y
      - copied unchanged from r40837, trunk/main/ast_expr2.y
    team/oej/callpickup/main/ast_expr2f.c
      - copied unchanged from r40837, trunk/main/ast_expr2f.c
    team/oej/callpickup/main/asterisk.c
      - copied unchanged from r40837, trunk/main/asterisk.c
    team/oej/callpickup/main/astmm.c
      - copied unchanged from r40837, trunk/main/astmm.c
    team/oej/callpickup/main/autoservice.c
      - copied unchanged from r40837, trunk/main/autoservice.c
    team/oej/callpickup/main/buildinfo.c
      - copied unchanged from r40837, trunk/main/buildinfo.c
    team/oej/callpickup/main/callerid.c
      - copied unchanged from r40837, trunk/main/callerid.c
    team/oej/callpickup/main/cdr.c
      - copied unchanged from r40837, trunk/main/cdr.c
    team/oej/callpickup/main/channel.c
      - copied unchanged from r40837, trunk/main/channel.c
    team/oej/callpickup/main/chanvars.c
      - copied unchanged from r40837, trunk/main/chanvars.c
    team/oej/callpickup/main/cli.c
      - copied unchanged from r40837, trunk/main/cli.c
    team/oej/callpickup/main/coef_in.h
      - copied unchanged from r40837, trunk/main/coef_in.h
    team/oej/callpickup/main/coef_out.h
      - copied unchanged from r40837, trunk/main/coef_out.h
    team/oej/callpickup/main/config.c
      - copied unchanged from r40837, trunk/main/config.c
    team/oej/callpickup/main/cryptostub.c
      - copied unchanged from r40837, trunk/main/cryptostub.c
    team/oej/callpickup/main/db.c
      - copied unchanged from r40837, trunk/main/db.c
    team/oej/callpickup/main/db1-ast/   (props changed)
      - copied from r40837, trunk/main/db1-ast/
    team/oej/callpickup/main/db1-ast/Makefile
      - copied unchanged from r40837, trunk/main/db1-ast/Makefile
    team/oej/callpickup/main/db1-ast/btree/
      - copied from r40837, trunk/main/db1-ast/btree/
    team/oej/callpickup/main/db1-ast/btree/bt_close.c
      - copied unchanged from r40837, trunk/main/db1-ast/btree/bt_close.c
    team/oej/callpickup/main/db1-ast/btree/bt_conv.c
      - copied unchanged from r40837, trunk/main/db1-ast/btree/bt_conv.c
    team/oej/callpickup/main/db1-ast/btree/bt_debug.c
      - copied unchanged from r40837, trunk/main/db1-ast/btree/bt_debug.c
    team/oej/callpickup/main/db1-ast/btree/bt_delete.c
      - copied unchanged from r40837, trunk/main/db1-ast/btree/bt_delete.c
    team/oej/callpickup/main/db1-ast/btree/bt_get.c
      - copied unchanged from r40837, trunk/main/db1-ast/btree/bt_get.c
    team/oej/callpickup/main/db1-ast/btree/bt_open.c
      - copied unchanged from r40837, trunk/main/db1-ast/btree/bt_open.c
    team/oej/callpickup/main/db1-ast/btree/bt_overflow.c
      - copied unchanged from r40837, trunk/main/db1-ast/btree/bt_overflow.c
    team/oej/callpickup/main/db1-ast/btree/bt_page.c
      - copied unchanged from r40837, trunk/main/db1-ast/btree/bt_page.c
    team/oej/callpickup/main/db1-ast/btree/bt_put.c
      - copied unchanged from r40837, trunk/main/db1-ast/btree/bt_put.c
    team/oej/callpickup/main/db1-ast/btree/bt_search.c
      - copied unchanged from r40837, trunk/main/db1-ast/btree/bt_search.c
    team/oej/callpickup/main/db1-ast/btree/bt_seq.c
      - copied unchanged from r40837, trunk/main/db1-ast/btree/bt_seq.c
    team/oej/callpickup/main/db1-ast/btree/bt_split.c
      - copied unchanged from r40837, trunk/main/db1-ast/btree/bt_split.c
    team/oej/callpickup/main/db1-ast/btree/bt_utils.c
      - copied unchanged from r40837, trunk/main/db1-ast/btree/bt_utils.c
    team/oej/callpickup/main/db1-ast/btree/btree.h
      - copied unchanged from r40837, trunk/main/db1-ast/btree/btree.h
    team/oej/callpickup/main/db1-ast/btree/extern.h
      - copied unchanged from r40837, trunk/main/db1-ast/btree/extern.h
    team/oej/callpickup/main/db1-ast/db/
      - copied from r40837, trunk/main/db1-ast/db/
    team/oej/callpickup/main/db1-ast/db/db.c
      - copied unchanged from r40837, trunk/main/db1-ast/db/db.c
    team/oej/callpickup/main/db1-ast/hash/
      - copied from r40837, trunk/main/db1-ast/hash/
    team/oej/callpickup/main/db1-ast/hash/README
      - copied unchanged from r40837, trunk/main/db1-ast/hash/README
    team/oej/callpickup/main/db1-ast/hash/extern.h
      - copied unchanged from r40837, trunk/main/db1-ast/hash/extern.h
    team/oej/callpickup/main/db1-ast/hash/hash.c
      - copied unchanged from r40837, trunk/main/db1-ast/hash/hash.c
    team/oej/callpickup/main/db1-ast/hash/hash.h
      - copied unchanged from r40837, trunk/main/db1-ast/hash/hash.h
    team/oej/callpickup/main/db1-ast/hash/hash_bigkey.c
      - copied unchanged from r40837, trunk/main/db1-ast/hash/hash_bigkey.c
    team/oej/callpickup/main/db1-ast/hash/hash_buf.c
      - copied unchanged from r40837, trunk/main/db1-ast/hash/hash_buf.c
    team/oej/callpickup/main/db1-ast/hash/hash_func.c
      - copied unchanged from r40837, trunk/main/db1-ast/hash/hash_func.c
    team/oej/callpickup/main/db1-ast/hash/hash_log2.c
      - copied unchanged from r40837, trunk/main/db1-ast/hash/hash_log2.c
    team/oej/callpickup/main/db1-ast/hash/hash_page.c
      - copied unchanged from r40837, trunk/main/db1-ast/hash/hash_page.c
    team/oej/callpickup/main/db1-ast/hash/hsearch.c
      - copied unchanged from r40837, trunk/main/db1-ast/hash/hsearch.c
    team/oej/callpickup/main/db1-ast/hash/ndbm.c
      - copied unchanged from r40837, trunk/main/db1-ast/hash/ndbm.c
    team/oej/callpickup/main/db1-ast/hash/page.h
      - copied unchanged from r40837, trunk/main/db1-ast/hash/page.h
    team/oej/callpickup/main/db1-ast/hash/search.h
      - copied unchanged from r40837, trunk/main/db1-ast/hash/search.h
    team/oej/callpickup/main/db1-ast/include/
      - copied from r40837, trunk/main/db1-ast/include/
    team/oej/callpickup/main/db1-ast/include/circ-queue.h
      - copied unchanged from r40837, trunk/main/db1-ast/include/circ-queue.h
    team/oej/callpickup/main/db1-ast/include/compat.h
      - copied unchanged from r40837, trunk/main/db1-ast/include/compat.h
    team/oej/callpickup/main/db1-ast/include/db.h
      - copied unchanged from r40837, trunk/main/db1-ast/include/db.h
    team/oej/callpickup/main/db1-ast/include/mpool.h
      - copied unchanged from r40837, trunk/main/db1-ast/include/mpool.h
    team/oej/callpickup/main/db1-ast/include/ndbm.h
      - copied unchanged from r40837, trunk/main/db1-ast/include/ndbm.h
    team/oej/callpickup/main/db1-ast/libdb.map
      - copied unchanged from r40837, trunk/main/db1-ast/libdb.map
    team/oej/callpickup/main/db1-ast/mpool/
      - copied from r40837, trunk/main/db1-ast/mpool/
    team/oej/callpickup/main/db1-ast/mpool/README
      - copied unchanged from r40837, trunk/main/db1-ast/mpool/README
    team/oej/callpickup/main/db1-ast/mpool/mpool.c
      - copied unchanged from r40837, trunk/main/db1-ast/mpool/mpool.c
    team/oej/callpickup/main/db1-ast/recno/
      - copied from r40837, trunk/main/db1-ast/recno/
    team/oej/callpickup/main/db1-ast/recno/extern.h
      - copied unchanged from r40837, trunk/main/db1-ast/recno/extern.h
    team/oej/callpickup/main/db1-ast/recno/rec_close.c
      - copied unchanged from r40837, trunk/main/db1-ast/recno/rec_close.c
    team/oej/callpickup/main/db1-ast/recno/rec_delete.c
      - copied unchanged from r40837, trunk/main/db1-ast/recno/rec_delete.c
    team/oej/callpickup/main/db1-ast/recno/rec_get.c
      - copied unchanged from r40837, trunk/main/db1-ast/recno/rec_get.c
    team/oej/callpickup/main/db1-ast/recno/rec_open.c
      - copied unchanged from r40837, trunk/main/db1-ast/recno/rec_open.c
    team/oej/callpickup/main/db1-ast/recno/rec_put.c
      - copied unchanged from r40837, trunk/main/db1-ast/recno/rec_put.c
    team/oej/callpickup/main/db1-ast/recno/rec_search.c
      - copied unchanged from r40837, trunk/main/db1-ast/recno/rec_search.c
    team/oej/callpickup/main/db1-ast/recno/rec_seq.c
      - copied unchanged from r40837, trunk/main/db1-ast/recno/rec_seq.c
    team/oej/callpickup/main/db1-ast/recno/rec_utils.c
      - copied unchanged from r40837, trunk/main/db1-ast/recno/rec_utils.c
    team/oej/callpickup/main/db1-ast/recno/recno.h
      - copied unchanged from r40837, trunk/main/db1-ast/recno/recno.h
    team/oej/callpickup/main/devicestate.c
      - copied unchanged from r40837, trunk/main/devicestate.c
    team/oej/callpickup/main/dlfcn.c
      - copied unchanged from r40837, trunk/main/dlfcn.c
    team/oej/callpickup/main/dns.c
      - copied unchanged from r40837, trunk/main/dns.c
    team/oej/callpickup/main/dnsmgr.c
      - copied unchanged from r40837, trunk/main/dnsmgr.c
    team/oej/callpickup/main/dsp.c
      - copied unchanged from r40837, trunk/main/dsp.c
    team/oej/callpickup/main/ecdisa.h
      - copied unchanged from r40837, trunk/main/ecdisa.h
    team/oej/callpickup/main/editline/   (props changed)
      - copied from r40837, trunk/main/editline/
    team/oej/callpickup/main/editline/CHANGES
      - copied unchanged from r40837, trunk/main/editline/CHANGES
    team/oej/callpickup/main/editline/INSTALL
      - copied unchanged from r40837, trunk/main/editline/INSTALL
    team/oej/callpickup/main/editline/Makefile.in
      - copied unchanged from r40837, trunk/main/editline/Makefile.in
    team/oej/callpickup/main/editline/PLATFORMS
      - copied unchanged from r40837, trunk/main/editline/PLATFORMS
    team/oej/callpickup/main/editline/README
      - copied unchanged from r40837, trunk/main/editline/README
    team/oej/callpickup/main/editline/TEST/
      - copied from r40837, trunk/main/editline/TEST/
    team/oej/callpickup/main/editline/TEST/test.c
      - copied unchanged from r40837, trunk/main/editline/TEST/test.c
    team/oej/callpickup/main/editline/chared.c
      - copied unchanged from r40837, trunk/main/editline/chared.c
    team/oej/callpickup/main/editline/chared.h
      - copied unchanged from r40837, trunk/main/editline/chared.h
    team/oej/callpickup/main/editline/common.c
      - copied unchanged from r40837, trunk/main/editline/common.c
    team/oej/callpickup/main/editline/config.guess
      - copied unchanged from r40837, trunk/main/editline/config.guess
    team/oej/callpickup/main/editline/config.h.in
      - copied unchanged from r40837, trunk/main/editline/config.h.in
    team/oej/callpickup/main/editline/config.sub
      - copied unchanged from r40837, trunk/main/editline/config.sub
    team/oej/callpickup/main/editline/configure
      - copied unchanged from r40837, trunk/main/editline/configure
    team/oej/callpickup/main/editline/configure.in
      - copied unchanged from r40837, trunk/main/editline/configure.in
    team/oej/callpickup/main/editline/editline.3
      - copied unchanged from r40837, trunk/main/editline/editline.3
    team/oej/callpickup/main/editline/editrc.5
      - copied unchanged from r40837, trunk/main/editline/editrc.5
    team/oej/callpickup/main/editline/el.c
      - copied unchanged from r40837, trunk/main/editline/el.c
    team/oej/callpickup/main/editline/el.h
      - copied unchanged from r40837, trunk/main/editline/el.h
    team/oej/callpickup/main/editline/emacs.c
      - copied unchanged from r40837, trunk/main/editline/emacs.c
    team/oej/callpickup/main/editline/hist.c
      - copied unchanged from r40837, trunk/main/editline/hist.c
    team/oej/callpickup/main/editline/hist.h
      - copied unchanged from r40837, trunk/main/editline/hist.h
    team/oej/callpickup/main/editline/histedit.h
      - copied unchanged from r40837, trunk/main/editline/histedit.h
    team/oej/callpickup/main/editline/history.c
      - copied unchanged from r40837, trunk/main/editline/history.c
    team/oej/callpickup/main/editline/install-sh
      - copied unchanged from r40837, trunk/main/editline/install-sh
    team/oej/callpickup/main/editline/key.c
      - copied unchanged from r40837, trunk/main/editline/key.c
    team/oej/callpickup/main/editline/key.h
      - copied unchanged from r40837, trunk/main/editline/key.h
    team/oej/callpickup/main/editline/makelist
      - copied unchanged from r40837, trunk/main/editline/makelist
    team/oej/callpickup/main/editline/map.c
      - copied unchanged from r40837, trunk/main/editline/map.c
    team/oej/callpickup/main/editline/map.h
      - copied unchanged from r40837, trunk/main/editline/map.h
    team/oej/callpickup/main/editline/np/   (props changed)
      - copied from r40837, trunk/main/editline/np/
    team/oej/callpickup/main/editline/np/fgetln.c
      - copied unchanged from r40837, trunk/main/editline/np/fgetln.c
    team/oej/callpickup/main/editline/np/strlcat.c
      - copied unchanged from r40837, trunk/main/editline/np/strlcat.c
    team/oej/callpickup/main/editline/np/strlcpy.c
      - copied unchanged from r40837, trunk/main/editline/np/strlcpy.c
    team/oej/callpickup/main/editline/np/unvis.c
      - copied unchanged from r40837, trunk/main/editline/np/unvis.c
    team/oej/callpickup/main/editline/np/vis.c
      - copied unchanged from r40837, trunk/main/editline/np/vis.c
    team/oej/callpickup/main/editline/np/vis.h
      - copied unchanged from r40837, trunk/main/editline/np/vis.h
    team/oej/callpickup/main/editline/parse.c
      - copied unchanged from r40837, trunk/main/editline/parse.c
    team/oej/callpickup/main/editline/parse.h
      - copied unchanged from r40837, trunk/main/editline/parse.h
    team/oej/callpickup/main/editline/prompt.c
      - copied unchanged from r40837, trunk/main/editline/prompt.c
    team/oej/callpickup/main/editline/prompt.h
      - copied unchanged from r40837, trunk/main/editline/prompt.h
    team/oej/callpickup/main/editline/read.c
      - copied unchanged from r40837, trunk/main/editline/read.c
    team/oej/callpickup/main/editline/read.h
      - copied unchanged from r40837, trunk/main/editline/read.h
    team/oej/callpickup/main/editline/readline/
      - copied from r40837, trunk/main/editline/readline/
    team/oej/callpickup/main/editline/readline.c
      - copied unchanged from r40837, trunk/main/editline/readline.c
    team/oej/callpickup/main/editline/readline/readline.h
      - copied unchanged from r40837, trunk/main/editline/readline/readline.h
    team/oej/callpickup/main/editline/refresh.c
      - copied unchanged from r40837, trunk/main/editline/refresh.c
    team/oej/callpickup/main/editline/refresh.h
      - copied unchanged from r40837, trunk/main/editline/refresh.h
    team/oej/callpickup/main/editline/search.c
      - copied unchanged from r40837, trunk/main/editline/search.c
    team/oej/callpickup/main/editline/search.h
      - copied unchanged from r40837, trunk/main/editline/search.h
    team/oej/callpickup/main/editline/sig.c
      - copied unchanged from r40837, trunk/main/editline/sig.c
    team/oej/callpickup/main/editline/sig.h
      - copied unchanged from r40837, trunk/main/editline/sig.h
    team/oej/callpickup/main/editline/sys.h
      - copied unchanged from r40837, trunk/main/editline/sys.h
    team/oej/callpickup/main/editline/term.c
      - copied unchanged from r40837, trunk/main/editline/term.c
    team/oej/callpickup/main/editline/term.h
      - copied unchanged from r40837, trunk/main/editline/term.h
    team/oej/callpickup/main/editline/tokenizer.c
      - copied unchanged from r40837, trunk/main/editline/tokenizer.c
    team/oej/callpickup/main/editline/tokenizer.h
      - copied unchanged from r40837, trunk/main/editline/tokenizer.h
    team/oej/callpickup/main/editline/tty.c
      - copied unchanged from r40837, trunk/main/editline/tty.c
    team/oej/callpickup/main/editline/tty.h
      - copied unchanged from r40837, trunk/main/editline/tty.h
    team/oej/callpickup/main/editline/vi.c
      - copied unchanged from r40837, trunk/main/editline/vi.c
    team/oej/callpickup/main/enum.c
      - copied unchanged from r40837, trunk/main/enum.c
    team/oej/callpickup/main/file.c
      - copied unchanged from r40837, trunk/main/file.c
    team/oej/callpickup/main/fixedjitterbuf.c
      - copied unchanged from r40837, trunk/main/fixedjitterbuf.c
    team/oej/callpickup/main/fixedjitterbuf.h
      - copied unchanged from r40837, trunk/main/fixedjitterbuf.h
    team/oej/callpickup/main/frame.c
      - copied unchanged from r40837, trunk/main/frame.c
    team/oej/callpickup/main/fskmodem.c
      - copied unchanged from r40837, trunk/main/fskmodem.c
    team/oej/callpickup/main/http.c
      - copied unchanged from r40837, trunk/main/http.c
    team/oej/callpickup/main/image.c
      - copied unchanged from r40837, trunk/main/image.c
    team/oej/callpickup/main/indications.c
      - copied unchanged from r40837, trunk/main/indications.c
    team/oej/callpickup/main/io.c
      - copied unchanged from r40837, trunk/main/io.c
    team/oej/callpickup/main/jitterbuf.c
      - copied unchanged from r40837, trunk/main/jitterbuf.c
    team/oej/callpickup/main/jitterbuf.h
      - copied unchanged from r40837, trunk/main/jitterbuf.h
    team/oej/callpickup/main/loader.c
      - copied unchanged from r40837, trunk/main/loader.c
    team/oej/callpickup/main/logger.c
      - copied unchanged from r40837, trunk/main/logger.c
    team/oej/callpickup/main/manager.c
      - copied unchanged from r40837, trunk/main/manager.c
    team/oej/callpickup/main/md5.c
      - copied unchanged from r40837, trunk/main/md5.c
    team/oej/callpickup/main/netsock.c
      - copied unchanged from r40837, trunk/main/netsock.c
    team/oej/callpickup/main/pbx.c
      - copied unchanged from r40837, trunk/main/pbx.c
    team/oej/callpickup/main/plc.c
      - copied unchanged from r40837, trunk/main/plc.c
    team/oej/callpickup/main/poll.c
      - copied unchanged from r40837, trunk/main/poll.c
    team/oej/callpickup/main/privacy.c
      - copied unchanged from r40837, trunk/main/privacy.c
    team/oej/callpickup/main/rtp.c
      - copied unchanged from r40837, trunk/main/rtp.c
    team/oej/callpickup/main/say.c
      - copied unchanged from r40837, trunk/main/say.c
    team/oej/callpickup/main/sched.c
      - copied unchanged from r40837, trunk/main/sched.c
    team/oej/callpickup/main/sha1.c
      - copied unchanged from r40837, trunk/main/sha1.c
    team/oej/callpickup/main/slinfactory.c
      - copied unchanged from r40837, trunk/main/slinfactory.c
    team/oej/callpickup/main/srv.c
      - copied unchanged from r40837, trunk/main/srv.c
    team/oej/callpickup/main/stdtime/   (props changed)
      - copied from r40837, trunk/main/stdtime/
    team/oej/callpickup/main/stdtime/Makefile
      - copied unchanged from r40837, trunk/main/stdtime/Makefile
    team/oej/callpickup/main/stdtime/localtime.c
      - copied unchanged from r40837, trunk/main/stdtime/localtime.c
    team/oej/callpickup/main/stdtime/test.c
      - copied unchanged from r40837, trunk/main/stdtime/test.c
    team/oej/callpickup/main/stdtime/tzfile.h
      - copied unchanged from r40837, trunk/main/stdtime/tzfile.h
    team/oej/callpickup/main/strcompat.c
      - copied unchanged from r40837, trunk/main/strcompat.c
    team/oej/callpickup/main/tdd.c
      - copied unchanged from r40837, trunk/main/tdd.c
    team/oej/callpickup/main/term.c
      - copied unchanged from r40837, trunk/main/term.c
    team/oej/callpickup/main/translate.c
      - copied unchanged from r40837, trunk/main/translate.c
    team/oej/callpickup/main/udptl.c
      - copied unchanged from r40837, trunk/main/udptl.c
    team/oej/callpickup/main/ulaw.c
      - copied unchanged from r40837, trunk/main/ulaw.c
    team/oej/callpickup/main/utils.c
      - copied unchanged from r40837, trunk/main/utils.c
    team/oej/callpickup/utils/muted.c
      - copied unchanged from r40837, trunk/utils/muted.c
Removed:
    team/oej/callpickup/abstract_jb.c
    team/oej/callpickup/acl.c
    team/oej/callpickup/aescrypt.c
    team/oej/callpickup/aeskey.c
    team/oej/callpickup/aesopt.h
    team/oej/callpickup/aestab.c
    team/oej/callpickup/alaw.c
    team/oej/callpickup/app.c
    team/oej/callpickup/ast_expr2.c
    team/oej/callpickup/ast_expr2.fl
    team/oej/callpickup/ast_expr2.h
    team/oej/callpickup/ast_expr2.y
    team/oej/callpickup/ast_expr2f.c
    team/oej/callpickup/asterisk.8
    team/oej/callpickup/asterisk.c
    team/oej/callpickup/asterisk.sgml
    team/oej/callpickup/astmm.c
    team/oej/callpickup/autoservice.c
    team/oej/callpickup/buildinfo.c
    team/oej/callpickup/callerid.c
    team/oej/callpickup/cdr.c
    team/oej/callpickup/channel.c
    team/oej/callpickup/chanvars.c
    team/oej/callpickup/cli.c
    team/oej/callpickup/coef_in.h
    team/oej/callpickup/coef_out.h
    team/oej/callpickup/config.c
    team/oej/callpickup/cryptostub.c
    team/oej/callpickup/cygwin/
    team/oej/callpickup/db.c
    team/oej/callpickup/db1-ast/
    team/oej/callpickup/devicestate.c
    team/oej/callpickup/dlfcn.c
    team/oej/callpickup/dns.c
    team/oej/callpickup/dnsmgr.c
    team/oej/callpickup/dsp.c
    team/oej/callpickup/ecdisa.h
    team/oej/callpickup/editline/
    team/oej/callpickup/enum.c
    team/oej/callpickup/file.c
    team/oej/callpickup/fixedjitterbuf.c
    team/oej/callpickup/fixedjitterbuf.h
    team/oej/callpickup/frame.c
    team/oej/callpickup/fskmodem.c
    team/oej/callpickup/http.c
    team/oej/callpickup/image.c
    team/oej/callpickup/indications.c
    team/oej/callpickup/io.c
    team/oej/callpickup/jitterbuf.c
    team/oej/callpickup/jitterbuf.h
    team/oej/callpickup/loader.c
    team/oej/callpickup/logger.c
    team/oej/callpickup/manager.c
    team/oej/callpickup/md5.c
    team/oej/callpickup/muted.c
    team/oej/callpickup/netsock.c
    team/oej/callpickup/pbx.c
    team/oej/callpickup/plc.c
    team/oej/callpickup/poll.c
    team/oej/callpickup/privacy.c
    team/oej/callpickup/rtp.c
    team/oej/callpickup/say.c
    team/oej/callpickup/sched.c
    team/oej/callpickup/sha1.c
    team/oej/callpickup/slinfactory.c
    team/oej/callpickup/sounds.txt
    team/oej/callpickup/srv.c
    team/oej/callpickup/stdtime/
    team/oej/callpickup/strcompat.c
    team/oej/callpickup/tdd.c
    team/oej/callpickup/term.c
    team/oej/callpickup/translate.c
    team/oej/callpickup/udptl.c
    team/oej/callpickup/ulaw.c
    team/oej/callpickup/utils.c
Modified:
    team/oej/callpickup/   (props changed)
    team/oej/callpickup/.cleancount
    team/oej/callpickup/Makefile
    team/oej/callpickup/Makefile.moddir_rules
    team/oej/callpickup/Makefile.rules
    team/oej/callpickup/UPGRADE.txt
    team/oej/callpickup/acinclude.m4
    team/oej/callpickup/agi/Makefile
    team/oej/callpickup/apps/   (props changed)
    team/oej/callpickup/apps/Makefile
    team/oej/callpickup/apps/app_adsiprog.c
    team/oej/callpickup/apps/app_alarmreceiver.c
    team/oej/callpickup/apps/app_amd.c
    team/oej/callpickup/apps/app_authenticate.c
    team/oej/callpickup/apps/app_cdr.c
    team/oej/callpickup/apps/app_chanisavail.c
    team/oej/callpickup/apps/app_channelredirect.c
    team/oej/callpickup/apps/app_chanspy.c
    team/oej/callpickup/apps/app_controlplayback.c
    team/oej/callpickup/apps/app_db.c
    team/oej/callpickup/apps/app_dial.c
    team/oej/callpickup/apps/app_dictate.c
    team/oej/callpickup/apps/app_directed_pickup.c
    team/oej/callpickup/apps/app_directory.c
    team/oej/callpickup/apps/app_disa.c
    team/oej/callpickup/apps/app_dumpchan.c
    team/oej/callpickup/apps/app_echo.c
    team/oej/callpickup/apps/app_exec.c
    team/oej/callpickup/apps/app_externalivr.c
    team/oej/callpickup/apps/app_festival.c
    team/oej/callpickup/apps/app_flash.c
    team/oej/callpickup/apps/app_followme.c
    team/oej/callpickup/apps/app_forkcdr.c
    team/oej/callpickup/apps/app_getcpeid.c
    team/oej/callpickup/apps/app_hasnewvoicemail.c
    team/oej/callpickup/apps/app_ices.c
    team/oej/callpickup/apps/app_image.c
    team/oej/callpickup/apps/app_ivrdemo.c
    team/oej/callpickup/apps/app_lookupblacklist.c
    team/oej/callpickup/apps/app_lookupcidname.c
    team/oej/callpickup/apps/app_macro.c
    team/oej/callpickup/apps/app_meetme.c
    team/oej/callpickup/apps/app_milliwatt.c
    team/oej/callpickup/apps/app_mixmonitor.c
    team/oej/callpickup/apps/app_morsecode.c
    team/oej/callpickup/apps/app_mp3.c
    team/oej/callpickup/apps/app_nbscat.c
    team/oej/callpickup/apps/app_osplookup.c
    team/oej/callpickup/apps/app_page.c
    team/oej/callpickup/apps/app_parkandannounce.c
    team/oej/callpickup/apps/app_playback.c
    team/oej/callpickup/apps/app_privacy.c
    team/oej/callpickup/apps/app_queue.c
    team/oej/callpickup/apps/app_random.c
    team/oej/callpickup/apps/app_read.c
    team/oej/callpickup/apps/app_readfile.c
    team/oej/callpickup/apps/app_realtime.c
    team/oej/callpickup/apps/app_record.c
    team/oej/callpickup/apps/app_rpt.c
    team/oej/callpickup/apps/app_sayunixtime.c
    team/oej/callpickup/apps/app_senddtmf.c
    team/oej/callpickup/apps/app_sendtext.c
    team/oej/callpickup/apps/app_setcallerid.c
    team/oej/callpickup/apps/app_setcdruserfield.c
    team/oej/callpickup/apps/app_settransfercapability.c
    team/oej/callpickup/apps/app_skel.c
    team/oej/callpickup/apps/app_sms.c
    team/oej/callpickup/apps/app_softhangup.c
    team/oej/callpickup/apps/app_speech_utils.c
    team/oej/callpickup/apps/app_stack.c
    team/oej/callpickup/apps/app_system.c
    team/oej/callpickup/apps/app_talkdetect.c
    team/oej/callpickup/apps/app_test.c
    team/oej/callpickup/apps/app_transfer.c
    team/oej/callpickup/apps/app_url.c
    team/oej/callpickup/apps/app_userevent.c
    team/oej/callpickup/apps/app_verbose.c
    team/oej/callpickup/apps/app_voicemail.c
    team/oej/callpickup/apps/app_waitforring.c
    team/oej/callpickup/apps/app_waitforsilence.c
    team/oej/callpickup/apps/app_while.c
    team/oej/callpickup/apps/app_zapateller.c
    team/oej/callpickup/apps/app_zapbarge.c
    team/oej/callpickup/apps/app_zapras.c
    team/oej/callpickup/apps/app_zapscan.c
    team/oej/callpickup/build_tools/cflags.xml
    team/oej/callpickup/build_tools/make_version
    team/oej/callpickup/build_tools/menuselect-deps.in
    team/oej/callpickup/build_tools/prep_moduledeps
    team/oej/callpickup/cdr/   (props changed)
    team/oej/callpickup/cdr/Makefile
    team/oej/callpickup/cdr/cdr_csv.c
    team/oej/callpickup/cdr/cdr_custom.c
    team/oej/callpickup/cdr/cdr_manager.c
    team/oej/callpickup/cdr/cdr_odbc.c
    team/oej/callpickup/cdr/cdr_pgsql.c
    team/oej/callpickup/cdr/cdr_radius.c
    team/oej/callpickup/cdr/cdr_sqlite.c
    team/oej/callpickup/cdr/cdr_tds.c
    team/oej/callpickup/channels/   (props changed)
    team/oej/callpickup/channels/Makefile
    team/oej/callpickup/channels/chan_agent.c
    team/oej/callpickup/channels/chan_alsa.c
    team/oej/callpickup/channels/chan_features.c
    team/oej/callpickup/channels/chan_h323.c
    team/oej/callpickup/channels/chan_iax2.c
    team/oej/callpickup/channels/chan_jingle.c
    team/oej/callpickup/channels/chan_local.c
    team/oej/callpickup/channels/chan_mgcp.c
    team/oej/callpickup/channels/chan_misdn.c
    team/oej/callpickup/channels/chan_nbs.c
    team/oej/callpickup/channels/chan_oss.c
    team/oej/callpickup/channels/chan_phone.c
    team/oej/callpickup/channels/chan_sip.c
    team/oej/callpickup/channels/chan_skinny.c
    team/oej/callpickup/channels/chan_zap.c
    team/oej/callpickup/channels/h323/Makefile
    team/oej/callpickup/channels/misdn/Makefile
    team/oej/callpickup/channels/misdn/ie.c
    team/oej/callpickup/channels/misdn/isdn_lib.c
    team/oej/callpickup/channels/misdn/isdn_lib.h
    team/oej/callpickup/channels/misdn/isdn_lib_intern.h
    team/oej/callpickup/channels/misdn/isdn_msg_parser.c
    team/oej/callpickup/codecs/   (props changed)
    team/oej/callpickup/codecs/Makefile
    team/oej/callpickup/codecs/codec_a_mu.c
    team/oej/callpickup/codecs/codec_adpcm.c
    team/oej/callpickup/codecs/codec_alaw.c
    team/oej/callpickup/codecs/codec_g726.c
    team/oej/callpickup/codecs/codec_gsm.c
    team/oej/callpickup/codecs/codec_ilbc.c
    team/oej/callpickup/codecs/codec_lpc10.c
    team/oej/callpickup/codecs/codec_speex.c
    team/oej/callpickup/codecs/codec_ulaw.c
    team/oej/callpickup/codecs/codec_zap.c
    team/oej/callpickup/codecs/gsm/Makefile
    team/oej/callpickup/configure
    team/oej/callpickup/configure.ac
    team/oej/callpickup/contrib/asterisk-ng-doxygen
    team/oej/callpickup/formats/   (props changed)
    team/oej/callpickup/formats/Makefile
    team/oej/callpickup/formats/format_g723.c
    team/oej/callpickup/formats/format_g726.c
    team/oej/callpickup/formats/format_g729.c
    team/oej/callpickup/formats/format_gsm.c
    team/oej/callpickup/formats/format_h263.c
    team/oej/callpickup/formats/format_h264.c
    team/oej/callpickup/formats/format_ilbc.c
    team/oej/callpickup/formats/format_jpeg.c
    team/oej/callpickup/formats/format_ogg_vorbis.c
    team/oej/callpickup/formats/format_pcm.c
    team/oej/callpickup/formats/format_sln.c
    team/oej/callpickup/formats/format_vox.c
    team/oej/callpickup/formats/format_wav.c
    team/oej/callpickup/formats/format_wav_gsm.c
    team/oej/callpickup/funcs/   (props changed)
    team/oej/callpickup/funcs/Makefile
    team/oej/callpickup/funcs/func_base64.c
    team/oej/callpickup/funcs/func_callerid.c
    team/oej/callpickup/funcs/func_cdr.c
    team/oej/callpickup/funcs/func_channel.c
    team/oej/callpickup/funcs/func_curl.c
    team/oej/callpickup/funcs/func_cut.c
    team/oej/callpickup/funcs/func_db.c
    team/oej/callpickup/funcs/func_enum.c
    team/oej/callpickup/funcs/func_env.c
    team/oej/callpickup/funcs/func_global.c
    team/oej/callpickup/funcs/func_groupcount.c
    team/oej/callpickup/funcs/func_language.c
    team/oej/callpickup/funcs/func_logic.c
    team/oej/callpickup/funcs/func_math.c
    team/oej/callpickup/funcs/func_md5.c
    team/oej/callpickup/funcs/func_moh.c
    team/oej/callpickup/funcs/func_odbc.c
    team/oej/callpickup/funcs/func_rand.c
    team/oej/callpickup/funcs/func_realtime.c
    team/oej/callpickup/funcs/func_sha1.c
    team/oej/callpickup/funcs/func_strings.c
    team/oej/callpickup/funcs/func_timeout.c
    team/oej/callpickup/funcs/func_uri.c
    team/oej/callpickup/include/asterisk.h
    team/oej/callpickup/include/asterisk/abstract_jb.h
    team/oej/callpickup/include/asterisk/autoconfig.h.in
    team/oej/callpickup/include/asterisk/cdr.h
    team/oej/callpickup/include/asterisk/compiler.h
    team/oej/callpickup/include/asterisk/dns.h
    team/oej/callpickup/include/asterisk/file.h
    team/oej/callpickup/include/asterisk/indications.h
    team/oej/callpickup/include/asterisk/linkedlists.h
    team/oej/callpickup/include/asterisk/lock.h
    team/oej/callpickup/include/asterisk/module.h
    team/oej/callpickup/include/asterisk/monitor.h
    team/oej/callpickup/include/asterisk/srv.h
    team/oej/callpickup/include/asterisk/translate.h
    team/oej/callpickup/include/asterisk/utils.h
    team/oej/callpickup/makeopts.in
    team/oej/callpickup/pbx/   (props changed)
    team/oej/callpickup/pbx/Makefile
    team/oej/callpickup/pbx/pbx_ael.c
    team/oej/callpickup/pbx/pbx_config.c
    team/oej/callpickup/pbx/pbx_dundi.c
    team/oej/callpickup/pbx/pbx_loopback.c
    team/oej/callpickup/pbx/pbx_realtime.c
    team/oej/callpickup/pbx/pbx_spool.c
    team/oej/callpickup/res/   (props changed)
    team/oej/callpickup/res/Makefile
    team/oej/callpickup/res/res_adsi.c
    team/oej/callpickup/res/res_agi.c
    team/oej/callpickup/res/res_clioriginate.c
    team/oej/callpickup/res/res_config_odbc.c
    team/oej/callpickup/res/res_config_pgsql.c
    team/oej/callpickup/res/res_convert.c
    team/oej/callpickup/res/res_crypto.c
    team/oej/callpickup/res/res_features.c
    team/oej/callpickup/res/res_indications.c
    team/oej/callpickup/res/res_jabber.c
    team/oej/callpickup/res/res_monitor.c
    team/oej/callpickup/res/res_musiconhold.c
    team/oej/callpickup/res/res_odbc.c
    team/oej/callpickup/res/res_smdi.c
    team/oej/callpickup/res/res_snmp.c
    team/oej/callpickup/res/res_speech.c
    team/oej/callpickup/sounds/Makefile
    team/oej/callpickup/utils/Makefile
    team/oej/callpickup/utils/ael_main.c

Propchange: team/oej/callpickup/
------------------------------------------------------------------------------
    automerge = http://edvina.net/training/

Propchange: team/oej/callpickup/
------------------------------------------------------------------------------
Binary property 'branch-1.2-blocked' - no diff available.

Propchange: team/oej/callpickup/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.

Propchange: team/oej/callpickup/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue Aug 22 13:18:54 2006
@@ -19,6 +19,7 @@
 menuselect.makedeps
 config.status
 config.log
-makeopts.xml
+menuselect-tree
 autom4te.cache
 muted
+makeopts.embed_rules

Propchange: team/oej/callpickup/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Aug 22 13:18:54 2006
@@ -1,1 +1,1 @@
-/trunk:1-40712
+/trunk:1-40841

Modified: team/oej/callpickup/.cleancount
URL: http://svn.digium.com/view/asterisk/team/oej/callpickup/.cleancount?rev=40843&r1=40842&r2=40843&view=diff
==============================================================================
--- team/oej/callpickup/.cleancount (original)
+++ team/oej/callpickup/.cleancount Tue Aug 22 13:18:54 2006
@@ -1,1 +1,1 @@
-21
+22

Modified: team/oej/callpickup/Makefile
URL: http://svn.digium.com/view/asterisk/team/oej/callpickup/Makefile?rev=40843&r1=40842&r2=40843&view=diff
==============================================================================
--- team/oej/callpickup/Makefile (original)
+++ team/oej/callpickup/Makefile Tue Aug 22 13:18:54 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
+
+ifeq ($(OSARCH),linux-gnu)
   ifeq ($(PROC),x86_64)
     # You must have GCC 3.4 to use k8, otherwise use athlon
     PROC=k8
@@ -216,28 +137,21 @@
   endif
 endif
 
-GREP=grep
 ID=id
 
 ifeq ($(OSARCH),SunOS)
-  GREP=/usr/xpg4/bin/grep
   M4=/usr/local/bin/m4
   ID=/usr/xpg4/bin/id
 endif
 
 ASTCFLAGS+=-pipe -Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG)
-ifneq ($(OPTIMIZE),)
-ASTCFLAGS+=$(OPTIMIZE)
-endif
 
 ifeq ($(AST_DEVMODE),yes)
   ASTCFLAGS+=-Werror -Wunused
 endif
 
-ASTOBJ=-o asterisk
-
-ifeq ($(findstring BSD,$(OSARCH)),BSD)
-  ASTCFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include -L$(CROSS_COMPILE_TARGET)/usr/local/lib
+ifneq ($(findstring BSD,$(OSARCH)),)

[... 21979 lines stripped ...]

More information about the asterisk-commits mailing list