[aadk-commits] qwell: branch upstreamsync r316 - /branches/upstreamsync/

[aadk-commits at lists.digium.com]

Author: qwell
Date: Tue Apr  3 16:55:39 2007
New Revision: 316

URL: http://svn.digium.com/view/aadk?view=rev&rev=316
Log:
Attempt svnmerge stuff again for upstreamsync branch.

Modified:
    branches/upstreamsync/   (props changed)

Propchange: branches/upstreamsync/
------------------------------------------------------------------------------
--- svnmerge-integrated (added)
+++ svnmerge-integrated Tue Apr  3 16:55:39 2007
@@ -1,0 +1,1 @@
+/trunk:1-308