[svn-commits] mmichelson: branch 1.6.1 r139531 - /branches/1.6.1/

[SVN commits to the Digium repositories]

Author: mmichelson
Date: Fri Aug 22 14:25:31 2008
New Revision: 139531

URL: http://svn.digium.com/view/asterisk?view=rev&rev=139531
Log:
Blocked revisions 139525 via svnmerge

................
r139525 | mmichelson | 2008-08-22 14:24:26 -0500 (Fri, 22 Aug 2008) | 15 lines

Blocked revisions 139521 via svnmerge

........
r139521 | mmichelson | 2008-08-22 14:23:02 -0500 (Fri, 22 Aug 2008) | 8 lines

Remove show_frame_stats_deprecated since it is not
used anywhere and causes build errors if building under
dev-mode with TRACE_FRAMES selected in menuselect.

(closes issue #13362)
Reported by: snuffy


........

................

Modified:
    branches/1.6.1/   (props changed)

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
--- trunk-blocked (original)
+++ trunk-blocked Fri Aug 22 14:25:31 2008
@@ -1,1 +1,1 @@
-/trunk:137901,138851,139020
+/trunk:137901,138851,139020,139525