[svn-commits] twilson: branch 1.6.1 r166910 - in /branches/1.6.1: ./ doc/ doc/tex/ phonepro...

[SVN commits to the Digium repositories]

Author: twilson
Date: Tue Dec 30 14:57:15 2008
New Revision: 166910

URL: http://svn.digium.com/view/asterisk?view=rev&rev=166910
Log:
Merged revisions 166908 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
  r166908 | twilson | 2008-12-30 14:50:05 -0600 (Tue, 30 Dec 2008) | 2 lines
  
  Fix some svn:keywords
........

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/doc/realtimetext.txt   (props changed)
    branches/1.6.1/doc/sip-retransmit.txt   (props changed)
    branches/1.6.1/doc/tex/phoneprov.tex   (props changed)
    branches/1.6.1/phoneprov/polycom_line.xml   (props changed)
    branches/1.6.1/res/res_http_post.c   (contents, props changed)
    branches/1.6.1/res/res_phoneprov.c   (contents, props changed)

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Propchange: branches/1.6.1/doc/realtimetext.txt
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Tue Dec 30 14:57:15 2008
@@ -1,1 +1,1 @@
-"Author Date Id Revision"
+Author Date Id Revision

Propchange: branches/1.6.1/doc/sip-retransmit.txt
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Tue Dec 30 14:57:15 2008
@@ -1,1 +1,1 @@
-"Author Date Id Revision"
+Author Date Id Revision

Propchange: branches/1.6.1/doc/tex/phoneprov.tex
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Tue Dec 30 14:57:15 2008
@@ -1,1 +1,1 @@
-"Author Date Id Revision"
+Author Date Id Revision

Propchange: branches/1.6.1/phoneprov/polycom_line.xml
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Tue Dec 30 14:57:15 2008
@@ -1,1 +1,1 @@
-"Author Date Id Revision"
+Author Date Id Revision

Modified: branches/1.6.1/res/res_http_post.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.1/res/res_http_post.c?view=diff&rev=166910&r1=166909&r2=166910
==============================================================================
--- branches/1.6.1/res/res_http_post.c (original)
+++ branches/1.6.1/res/res_http_post.c Tue Dec 30 14:57:15 2008
@@ -32,7 +32,7 @@
 
 #include "asterisk.h"
 
-ASTERISK_FILE_VERSION(__FILE__, "$Revision: 111213 $")
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include <sys/stat.h>
 #include <fcntl.h>

Propchange: branches/1.6.1/res/res_http_post.c
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Tue Dec 30 14:57:15 2008
@@ -1,1 +1,1 @@
-"Author Date Id Revision"
+Author Date Id Revision

Modified: branches/1.6.1/res/res_phoneprov.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.1/res/res_phoneprov.c?view=diff&rev=166910&r1=166909&r2=166910
==============================================================================
--- branches/1.6.1/res/res_phoneprov.c (original)
+++ branches/1.6.1/res/res_phoneprov.c Tue Dec 30 14:57:15 2008
@@ -38,7 +38,7 @@
 #ifdef SOLARIS
 #include <sys/sockio.h>
 #endif
-ASTERISK_FILE_VERSION(__FILE__, "$Revision: 96773 $")
+ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 
 #include "asterisk/channel.h"
 #include "asterisk/file.h"

Propchange: branches/1.6.1/res/res_phoneprov.c
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords Tue Dec 30 14:57:15 2008
@@ -1,1 +1,1 @@
-"Author Date Id Revision"
+Author Date Id Revision