[zaptel-commits] tzafrir: branch 1.2 r1672 - /branches/1.2/xpp/

[zaptel-commits at lists.digium.com]

Author: tzafrir
Date: Thu Nov 30 17:47:49 2006
New Revision: 1672

URL: http://svn.digium.com/view/zaptel?view=rev&rev=1672
Log:
Current merge status.

Modified:
    branches/1.2/xpp/   (props changed)

Propchange: branches/1.2/xpp/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Thu Nov 30 17:47:49 2006
@@ -1,4 +1,7 @@
-283159da-0705-0410-b60c-f2062b4bb6ad:/components/xpp-zaptel/trunk/xpp:2806
+283159da-0705-0410-b60c-f2062b4bb6ad:/components/xpp-zaptel/branches/RELEASE-1.2.0/xpp:2832
+283159da-0705-0410-b60c-f2062b4bb6ad:/components/xpp-zaptel/trunk/xpp:2830
+
 f558416c-6c06-0410-9f27-dde2687782d0:/branches/1.4/xpp:1623
 f558416c-6c06-0410-9f27-dde2687782d0:/team/tzafrir/xpp_1.2/xpp:1554
+
 f558416c-6c06-0410-9f27-dde2687782d0:/trunk/xpp:1453