[zaptel-commits] tzafrir: trunk r2068 - /trunk/xpp/

[zaptel-commits at lists.digium.com]

Author: tzafrir
Date: Wed Jan 31 14:39:02 2007
New Revision: 2068

URL: http://svn.digium.com/view/zaptel?view=rev&rev=2068
Log:
 r1921 at boomtime:  kpfleming | 2007-01-23 17:29:28 +0200
 Merged revisions 1920 via svnmerge from 
 https://origsvn.digium.com/svn/zaptel/branches/1.2
 
 ........
 r1920 | kpfleming | 2007-01-23 09:25:42 -0600 (Tue, 23 Jan 2007) | 2 lines
 
 clean up various compiler warnings
 
 ........
 

Modified:
    trunk/xpp/   (props changed)

Propchange: trunk/xpp/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Wed Jan 31 14:39:02 2007
@@ -1,5 +1,5 @@
 283159da-0705-0410-b60c-f2062b4bb6ad:/components/xpp-zaptel/branches/RELEASE-1.2.0/xpp:2933
 283159da-0705-0410-b60c-f2062b4bb6ad:/components/xpp-zaptel/trunk/xpp:2830
 f558416c-6c06-0410-9f27-dde2687782d0:/branches/1.2/xpp:1724
-f558416c-6c06-0410-9f27-dde2687782d0:/branches/1.4/xpp:1767
+f558416c-6c06-0410-9f27-dde2687782d0:/branches/1.4/xpp:1921
 f558416c-6c06-0410-9f27-dde2687782d0:/team/tzafrir/xpp_1.2/xpp:1554