[svn-commits] pabelanger: trunk r361429 - in /trunk: ./ bridges/ funcs/

[SVN commits to the Digium repositories]

Author: pabelanger
Date: Fri Apr  6 11:33:24 2012
New Revision: 361429

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=361429
Log:
Multiple revisions 361403,361412

........
  r361403 | pabelanger | 2012-04-06 12:24:36 -0400 (Fri, 06 Apr 2012) | 2 lines
  
  Fix typo in svn:keywords
........
  r361412 | pabelanger | 2012-04-06 12:27:30 -0400 (Fri, 06 Apr 2012) | 2 lines
  
  Fix typo in svn:keywords
........

Merged revisions 361403,361412 from http://svn.asterisk.org/svn/asterisk/branches/1.8
........

Merged revisions 361422 from http://svn.asterisk.org/svn/asterisk/branches/10

Modified:
    trunk/   (props changed)
    trunk/bridges/bridge_builtin_features.c   (props changed)
    trunk/bridges/bridge_multiplexed.c   (props changed)
    trunk/funcs/func_sysinfo.c   (contents, props changed)

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-10-merged' - no diff available.

Propchange: trunk/bridges/bridge_builtin_features.c
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Fri Apr  6 11:33:24 2012
@@ -1,1 +1,1 @@
-'Author Date Id Revision'
+Author Date Id Revision

Propchange: trunk/bridges/bridge_multiplexed.c
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Fri Apr  6 11:33:24 2012
@@ -1,1 +1,1 @@
-'Author Date Id Revision'
+Author Date Id Revision

Modified: trunk/funcs/func_sysinfo.c
URL: http://svnview.digium.com/svn/asterisk/trunk/funcs/func_sysinfo.c?view=diff&rev=361429&r1=361428&r2=361429
==============================================================================
--- trunk/funcs/func_sysinfo.c (original)
+++ trunk/funcs/func_sysinfo.c Fri Apr  6 11:33:24 2012
@@ -31,7 +31,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision: 87233 $")
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #if defined(HAVE_SYSINFO)
 #include <sys/sysinfo.h>

Propchange: trunk/funcs/func_sysinfo.c
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Fri Apr  6 11:33:24 2012
@@ -1,1 +1,1 @@
-jpeeler 2007\/11\/19 jpeeler 89421
+Author Date Id Revision