[asterisk-commits] r39963 - svn:log

[asterisk-commits at lists.digium.com]

Author: pcadach
Revision: 39963
Modified property: svn:log

Modified: svn:log at Wed Aug 16 11:29:33 2006
------------------------------------------------------------------------------
--- svn:log (original)
+++ svn:log Wed Aug 16 11:29:33 2006
@@ -1,1 +1,36 @@
-Resolve auto-merge conflict
+Merged revisions 39932-39934,39936 via svnmerge from 
+https://origsvn.digium.com/svn/asterisk/trunk
+
+................
+r39932 | russell | 2006-08-16 04:17:38 +0600 (Срд, 16 Авг 2006) | 3 lines
+
+reduce duplicated code by using print_codec_to_cli in sip_show_user as it is
+already used in sip_show_peer (issue #7739, DEA)
+
+................
+r39933 | russell | 2006-08-16 04:28:38 +0600 (Срд, 16 Авг 2006) | 3 lines
+
+print a more user friendly error message with the text representation of codecs
+(issue #7233, Mithraen)
+
+................
+r39934 | murf | 2006-08-16 04:37:33 +0600 (Срд, 16 Авг 2006) | 3 lines
+
+block the indicated 1.2 branch from being merged into trunk; it's already here.
+
+
+................
+r39936 | russell | 2006-08-16 04:51:49 +0600 (Срд, 16 Авг 2006) | 11 lines
+
+Merged revisions 39935 via svnmerge from 
+https://origsvn.digium.com/svn/asterisk/branches/1.2
+
+........
+r39935 | russell | 2006-08-15 18:49:41 -0400 (Tue, 15 Aug 2006) | 3 lines
+
+use pbx_builtin_getvar_helper() so that GET VARIABLE can retrieve global
+variables (issue #7609)
+
+........
+
+................