[svn-commits] kpfleming: branch kpfleming/echocanparams r3519 - /team/kpfleming/echocanparams/

[SVN commits to the Digium repositories]

Author: kpfleming
Date: Tue Dec 18 12:41:59 2007
New Revision: 3519

URL: http://svn.digium.com/view/zaptel?view=rev&rev=3519
Log:
setup for automerge, although this branch isn't going to live very long

Modified:
    team/kpfleming/echocanparams/   (props changed)

Propchange: team/kpfleming/echocanparams/
------------------------------------------------------------------------------
--- automerge (original)
+++ automerge Tue Dec 18 12:41:59 2007
@@ -1,1 +1,1 @@
-yes
+*

Propchange: team/kpfleming/echocanparams/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Dec 18 12:41:59 2007
@@ -1,1 +1,1 @@
-/branches/1.4:1-3476
+/branches/1.4:1-3505