[svn-commits] twilson: branch 1.6.0 r166909 - in /branches/1.6.0: ./ doc/ doc/tex/ res/

[SVN commits to the Digium repositories]

Author: twilson
Date: Tue Dec 30 14:55:05 2008
New Revision: 166909

URL: http://svn.digium.com/view/asterisk?view=rev&rev=166909
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.0/   (props changed)
    branches/1.6.0/doc/realtimetext.txt   (props changed)
    branches/1.6.0/doc/sip-retransmit.txt   (props changed)
    branches/1.6.0/doc/tex/phoneprov.tex   (props changed)
    branches/1.6.0/res/res_phoneprov.c   (contents, props changed)

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

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

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

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

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

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