[asterisk-commits] loren: branch loren/sdp-parser r275545 - in /team/loren/sdp-parser: ./ addons...

[SVN commits to the Asterisk project]

Author: loren
Date: Sun Jul 11 02:15:52 2010
New Revision: 275545

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=275545
Log:
svnmerge and automerge init

Modified:
    team/loren/sdp-parser/   (props changed)
    team/loren/sdp-parser/BUGS   (props changed)
    team/loren/sdp-parser/CHANGES   (props changed)
    team/loren/sdp-parser/COPYING   (props changed)
    team/loren/sdp-parser/CREDITS   (props changed)
    team/loren/sdp-parser/LICENSE   (props changed)
    team/loren/sdp-parser/Makefile   (props changed)
    team/loren/sdp-parser/Makefile.moddir_rules   (props changed)
    team/loren/sdp-parser/Makefile.rules   (props changed)
    team/loren/sdp-parser/README   (props changed)
    team/loren/sdp-parser/README-SERIOUSLY.bestpractices.txt   (props changed)
    team/loren/sdp-parser/README-addons.txt   (props changed)
    team/loren/sdp-parser/UPGRADE-1.2.txt   (props changed)
    team/loren/sdp-parser/UPGRADE-1.4.txt   (props changed)
    team/loren/sdp-parser/UPGRADE-1.6.txt   (props changed)
    team/loren/sdp-parser/UPGRADE.txt   (props changed)
    team/loren/sdp-parser/Zaptel-to-DAHDI.txt   (props changed)
    team/loren/sdp-parser/addons/   (props changed)
    team/loren/sdp-parser/agi/   (props changed)
    team/loren/sdp-parser/apps/   (props changed)
    team/loren/sdp-parser/autoconf/   (props changed)
    team/loren/sdp-parser/bootstrap.sh   (props changed)
    team/loren/sdp-parser/bridges/   (props changed)
    team/loren/sdp-parser/build_tools/   (props changed)
    team/loren/sdp-parser/cdr/   (props changed)
    team/loren/sdp-parser/cel/   (props changed)
    team/loren/sdp-parser/channels/   (props changed)
    team/loren/sdp-parser/codecs/   (props changed)
    team/loren/sdp-parser/config.guess   (props changed)
    team/loren/sdp-parser/config.sub   (props changed)
    team/loren/sdp-parser/configs/   (props changed)
    team/loren/sdp-parser/configure   (props changed)
    team/loren/sdp-parser/configure.ac   (props changed)
    team/loren/sdp-parser/contrib/   (props changed)
    team/loren/sdp-parser/default.exports   (props changed)
    team/loren/sdp-parser/doc/   (props changed)
    team/loren/sdp-parser/formats/   (props changed)
    team/loren/sdp-parser/funcs/   (props changed)
    team/loren/sdp-parser/images/   (props changed)
    team/loren/sdp-parser/include/   (props changed)
    team/loren/sdp-parser/install-sh   (props changed)
    team/loren/sdp-parser/keys/   (props changed)
    team/loren/sdp-parser/main/   (props changed)
    team/loren/sdp-parser/makeopts.in   (props changed)
    team/loren/sdp-parser/missing   (props changed)
    team/loren/sdp-parser/mkinstalldirs   (props changed)
    team/loren/sdp-parser/pbx/   (props changed)
    team/loren/sdp-parser/phoneprov/   (props changed)
    team/loren/sdp-parser/res/   (props changed)
    team/loren/sdp-parser/sample.call   (props changed)
    team/loren/sdp-parser/sounds/   (props changed)
    team/loren/sdp-parser/static-http/   (props changed)
    team/loren/sdp-parser/tests/   (props changed)
    team/loren/sdp-parser/utils/   (props changed)

Propchange: team/loren/sdp-parser/
------------------------------------------------------------------------------
    svnmerge-integrated = /trunk:1-274088

Propchange: team/loren/sdp-parser/BUGS
------------------------------------------------------------------------------
    automerge = addons

Propchange: team/loren/sdp-parser/BUGS
------------------------------------------------------------------------------
    automerge-email = lorensr at gmail.com

Propchange: team/loren/sdp-parser/CHANGES
------------------------------------------------------------------------------
    automerge = addons

Propchange: team/loren/sdp-parser/CHANGES
------------------------------------------------------------------------------
    automerge-email = lorensr at gmail.com

Propchange: team/loren/sdp-parser/COPYING
------------------------------------------------------------------------------
    automerge = addons

Propchange: team/loren/sdp-parser/COPYING
------------------------------------------------------------------------------
    automerge-email = lorensr at gmail.com

Propchange: team/loren/sdp-parser/CREDITS
------------------------------------------------------------------------------
    automerge = addons

Propchange: team/loren/sdp-parser/CREDITS
------------------------------------------------------------------------------
    automerge-email = lorensr at gmail.com

Propchange: team/loren/sdp-parser/LICENSE
------------------------------------------------------------------------------
    automerge = addons

Propchange: team/loren/sdp-parser/LICENSE
------------------------------------------------------------------------------
    automerge-email = lorensr at gmail.com

Propchange: team/loren/sdp-parser/Makefile
------------------------------------------------------------------------------
    automerge = addons

Propchange: team/loren/sdp-parser/Makefile
------------------------------------------------------------------------------
    automerge-email = lorensr at gmail.com

Propchange: team/loren/sdp-parser/Makefile.moddir_rules
------------------------------------------------------------------------------
    automerge = addons

Propchange: team/loren/sdp-parser/Makefile.moddir_rules
------------------------------------------------------------------------------
    automerge-email = lorensr at gmail.com

Propchange: team/loren/sdp-parser/Makefile.rules
------------------------------------------------------------------------------
    automerge = addons

Propchange: team/loren/sdp-parser/Makefile.rules
------------------------------------------------------------------------------
    automerge-email = lorensr at gmail.com

Propchange: team/loren/sdp-parser/README
------------------------------------------------------------------------------
    automerge = addons

Propchange: team/loren/sdp-parser/README
------------------------------------------------------------------------------
    automerge-email = lorensr at gmail.com

Propchange: team/loren/sdp-parser/README-SERIOUSLY.bestpractices.txt
------------------------------------------------------------------------------
    automerge = addons

Propchange: team/loren/sdp-parser/README-SERIOUSLY.bestpractices.txt
------------------------------------------------------------------------------
    automerge-email = lorensr at gmail.com

Propchange: team/loren/sdp-parser/README-addons.txt
------------------------------------------------------------------------------
    automerge = addons

Propchange: team/loren/sdp-parser/README-addons.txt
------------------------------------------------------------------------------
    automerge-email = lorensr at gmail.com

Propchange: team/loren/sdp-parser/UPGRADE-1.2.txt
------------------------------------------------------------------------------
    automerge = addons

Propchange: team/loren/sdp-parser/UPGRADE-1.2.txt
------------------------------------------------------------------------------
    automerge-email = lorensr at gmail.com

Propchange: team/loren/sdp-parser/UPGRADE-1.4.txt
------------------------------------------------------------------------------
    automerge = addons

Propchange: team/loren/sdp-parser/UPGRADE-1.4.txt
------------------------------------------------------------------------------
    automerge-email = lorensr at gmail.com

Propchange: team/loren/sdp-parser/UPGRADE-1.6.txt
------------------------------------------------------------------------------
    automerge = addons

Propchange: team/loren/sdp-parser/UPGRADE-1.6.txt
------------------------------------------------------------------------------
    automerge-email = lorensr at gmail.com

Propchange: team/loren/sdp-parser/UPGRADE.txt
------------------------------------------------------------------------------
    automerge = addons

Propchange: team/loren/sdp-parser/UPGRADE.txt
------------------------------------------------------------------------------
    automerge-email = lorensr at gmail.com

Propchange: team/loren/sdp-parser/Zaptel-to-DAHDI.txt
------------------------------------------------------------------------------
    automerge = addons

Propchange: team/loren/sdp-parser/Zaptel-to-DAHDI.txt
------------------------------------------------------------------------------
    automerge-email = lorensr at gmail.com

Propchange: team/loren/sdp-parser/addons/
------------------------------------------------------------------------------
    automerge-email = lorensr at gmail.com

Propchange: team/loren/sdp-parser/agi/
------------------------------------------------------------------------------
    automerge = addons

Propchange: team/loren/sdp-parser/agi/
------------------------------------------------------------------------------
    automerge-email = lorensr at gmail.com

Propchange: team/loren/sdp-parser/apps/
------------------------------------------------------------------------------
    automerge = addons

Propchange: team/loren/sdp-parser/apps/
------------------------------------------------------------------------------
    automerge-email = lorensr at gmail.com

Propchange: team/loren/sdp-parser/autoconf/
------------------------------------------------------------------------------
    automerge = addons

Propchange: team/loren/sdp-parser/autoconf/
------------------------------------------------------------------------------
    automerge-email = lorensr at gmail.com

Propchange: team/loren/sdp-parser/bootstrap.sh
------------------------------------------------------------------------------
    automerge = addons

Propchange: team/loren/sdp-parser/bootstrap.sh
------------------------------------------------------------------------------
    automerge-email = lorensr at gmail.com

Propchange: team/loren/sdp-parser/bridges/
------------------------------------------------------------------------------
    automerge = addons

Propchange: team/loren/sdp-parser/bridges/
------------------------------------------------------------------------------
    automerge-email = lorensr at gmail.com

Propchange: team/loren/sdp-parser/build_tools/
------------------------------------------------------------------------------
    automerge = addons

Propchange: team/loren/sdp-parser/build_tools/
------------------------------------------------------------------------------
    automerge-email = lorensr at gmail.com

Propchange: team/loren/sdp-parser/cdr/
------------------------------------------------------------------------------
    automerge = addons

Propchange: team/loren/sdp-parser/cdr/
------------------------------------------------------------------------------
    automerge-email = lorensr at gmail.com

Propchange: team/loren/sdp-parser/cel/
------------------------------------------------------------------------------
    automerge = addons

Propchange: team/loren/sdp-parser/cel/
------------------------------------------------------------------------------
    automerge-email = lorensr at gmail.com

Propchange: team/loren/sdp-parser/channels/
------------------------------------------------------------------------------
    automerge = addons

Propchange: team/loren/sdp-parser/channels/
------------------------------------------------------------------------------
    automerge-email = lorensr at gmail.com

Propchange: team/loren/sdp-parser/codecs/
------------------------------------------------------------------------------
    automerge = addons

Propchange: team/loren/sdp-parser/codecs/
------------------------------------------------------------------------------
    automerge-email = lorensr at gmail.com

Propchange: team/loren/sdp-parser/config.guess
------------------------------------------------------------------------------
    automerge = addons

Propchange: team/loren/sdp-parser/config.guess
------------------------------------------------------------------------------
    automerge-email = lorensr at gmail.com

Propchange: team/loren/sdp-parser/config.sub
------------------------------------------------------------------------------
    automerge = addons

Propchange: team/loren/sdp-parser/config.sub
------------------------------------------------------------------------------
    automerge-email = lorensr at gmail.com

Propchange: team/loren/sdp-parser/configs/
------------------------------------------------------------------------------
    automerge = addons

Propchange: team/loren/sdp-parser/configs/
------------------------------------------------------------------------------
    automerge-email = lorensr at gmail.com

Propchange: team/loren/sdp-parser/configure
------------------------------------------------------------------------------
    automerge = addons

Propchange: team/loren/sdp-parser/configure
------------------------------------------------------------------------------
    automerge-email = lorensr at gmail.com

Propchange: team/loren/sdp-parser/configure.ac
------------------------------------------------------------------------------
    automerge = addons

Propchange: team/loren/sdp-parser/configure.ac
------------------------------------------------------------------------------
    automerge-email = lorensr at gmail.com

Propchange: team/loren/sdp-parser/contrib/
------------------------------------------------------------------------------
    automerge = addons

Propchange: team/loren/sdp-parser/contrib/
------------------------------------------------------------------------------
    automerge-email = lorensr at gmail.com

Propchange: team/loren/sdp-parser/default.exports
------------------------------------------------------------------------------
    automerge = addons

Propchange: team/loren/sdp-parser/default.exports
------------------------------------------------------------------------------
    automerge-email = lorensr at gmail.com

Propchange: team/loren/sdp-parser/doc/
------------------------------------------------------------------------------
    automerge = addons

Propchange: team/loren/sdp-parser/doc/
------------------------------------------------------------------------------
    automerge-email = lorensr at gmail.com

Propchange: team/loren/sdp-parser/formats/
------------------------------------------------------------------------------
    automerge = addons

Propchange: team/loren/sdp-parser/formats/
------------------------------------------------------------------------------
    automerge-email = lorensr at gmail.com

Propchange: team/loren/sdp-parser/funcs/
------------------------------------------------------------------------------
    automerge = addons

Propchange: team/loren/sdp-parser/funcs/
------------------------------------------------------------------------------
    automerge-email = lorensr at gmail.com

Propchange: team/loren/sdp-parser/images/
------------------------------------------------------------------------------
    automerge = addons

Propchange: team/loren/sdp-parser/images/
------------------------------------------------------------------------------
    automerge-email = lorensr at gmail.com

Propchange: team/loren/sdp-parser/include/
------------------------------------------------------------------------------
    automerge = addons

Propchange: team/loren/sdp-parser/include/
------------------------------------------------------------------------------
    automerge-email = lorensr at gmail.com

Propchange: team/loren/sdp-parser/install-sh
------------------------------------------------------------------------------
    automerge = addons

Propchange: team/loren/sdp-parser/install-sh
------------------------------------------------------------------------------
    automerge-email = lorensr at gmail.com

Propchange: team/loren/sdp-parser/keys/
------------------------------------------------------------------------------
    automerge = addons

Propchange: team/loren/sdp-parser/keys/
------------------------------------------------------------------------------
    automerge-email = lorensr at gmail.com

Propchange: team/loren/sdp-parser/main/
------------------------------------------------------------------------------
    automerge = addons

Propchange: team/loren/sdp-parser/main/
------------------------------------------------------------------------------
    automerge-email = lorensr at gmail.com

Propchange: team/loren/sdp-parser/makeopts.in
------------------------------------------------------------------------------
    automerge = addons

Propchange: team/loren/sdp-parser/makeopts.in
------------------------------------------------------------------------------
    automerge-email = lorensr at gmail.com

Propchange: team/loren/sdp-parser/missing
------------------------------------------------------------------------------
    automerge = addons

Propchange: team/loren/sdp-parser/missing
------------------------------------------------------------------------------
    automerge-email = lorensr at gmail.com

Propchange: team/loren/sdp-parser/mkinstalldirs
------------------------------------------------------------------------------
    automerge = addons

Propchange: team/loren/sdp-parser/mkinstalldirs
------------------------------------------------------------------------------
    automerge-email = lorensr at gmail.com

Propchange: team/loren/sdp-parser/pbx/
------------------------------------------------------------------------------
    automerge = addons

Propchange: team/loren/sdp-parser/pbx/
------------------------------------------------------------------------------
    automerge-email = lorensr at gmail.com

Propchange: team/loren/sdp-parser/phoneprov/
------------------------------------------------------------------------------
    automerge = addons

Propchange: team/loren/sdp-parser/phoneprov/
------------------------------------------------------------------------------
    automerge-email = lorensr at gmail.com

Propchange: team/loren/sdp-parser/res/
------------------------------------------------------------------------------
    automerge = addons

Propchange: team/loren/sdp-parser/res/
------------------------------------------------------------------------------
    automerge-email = lorensr at gmail.com

Propchange: team/loren/sdp-parser/sample.call
------------------------------------------------------------------------------
    automerge = addons

Propchange: team/loren/sdp-parser/sample.call
------------------------------------------------------------------------------
    automerge-email = lorensr at gmail.com

Propchange: team/loren/sdp-parser/sounds/
------------------------------------------------------------------------------
    automerge = addons

Propchange: team/loren/sdp-parser/sounds/
------------------------------------------------------------------------------
    automerge-email = lorensr at gmail.com

Propchange: team/loren/sdp-parser/static-http/
------------------------------------------------------------------------------
    automerge = addons

Propchange: team/loren/sdp-parser/static-http/
------------------------------------------------------------------------------
    automerge-email = lorensr at gmail.com

Propchange: team/loren/sdp-parser/tests/
------------------------------------------------------------------------------
    automerge = addons

Propchange: team/loren/sdp-parser/tests/
------------------------------------------------------------------------------
    automerge-email = lorensr at gmail.com

Propchange: team/loren/sdp-parser/utils/
------------------------------------------------------------------------------
    automerge = addons

Propchange: team/loren/sdp-parser/utils/
------------------------------------------------------------------------------
    automerge-email = lorensr at gmail.com