[svn-commits] file: branch file/app_dial_tools r144632 - /team/file/app_dial_tools/

[SVN commits to the Digium repositories]

Author: file
Date: Fri Sep 26 11:39:24 2008
New Revision: 144632

URL: http://svn.digium.com/view/asterisk?view=rev&rev=144632
Log:
Initialize merging stuff and things.

Modified:
    team/file/app_dial_tools/   (props changed)

Propchange: team/file/app_dial_tools/
------------------------------------------------------------------------------
--- automerge (original)
+++ automerge Fri Sep 26 11:39:24 2008
@@ -1,1 +1,1 @@
-*
+maybe

Propchange: team/file/app_dial_tools/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Sep 26 11:39:24 2008
@@ -1,1 +1,1 @@
-/trunk:1-144574
+/team/file/bridging:1-144630 /trunk:1-144574