[svn-commits] seanbright: trunk r302553 - in /trunk: ./ main/features.c

[SVN commits to the Digium repositories]

Author: seanbright
Date: Wed Jan 19 12:55:43 2011
New Revision: 302553

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=302553
Log:
Merged revisions 302552 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r302552 | seanbright | 2011-01-19 13:54:47 -0500 (Wed, 19 Jan 2011) | 14 lines
  
  Merged revisions 302551 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2
  
  ........
    r302551 | seanbright | 2011-01-19 13:54:03 -0500 (Wed, 19 Jan 2011) | 7 lines
    
    Remove an extraneous \r\n at the end of a parking manager events.
    
    (closes issue #18363)
    Reported by: clegall_proformatique
    Patches:
          asterisk_1.8_295998_parking_manager_events_format.patch uploaded by clegall proformatique (license 1139)
  ........
................

Modified:
    trunk/   (props changed)
    trunk/main/features.c

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

Modified: trunk/main/features.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/features.c?view=diff&rev=302553&r1=302552&r2=302553
==============================================================================
--- trunk/main/features.c (original)
+++ trunk/main/features.c Wed Jan 19 12:55:43 2011
@@ -3928,7 +3928,7 @@
 		"Parkinglot: %s\r\n"
 		"CallerIDNum: %s\r\n"
 		"CallerIDName: %s\r\n"
-		"UniqueID: %s\r\n\r\n",
+		"UniqueID: %s\r\n",
 		pu->parkingexten, 
 		pu->chan->name,
 		pu->parkinglot->name,