[asterisk-commits] qwell: branch 1.6.0 r259840 - in /branches/1.6.0: ./ makeopts.in

[SVN commits to the Asterisk project]

Author: qwell
Date: Wed Apr 28 15:27:07 2010
New Revision: 259840

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

................
  r259837 | qwell | 2010-04-28 15:26:35 -0500 (Wed, 28 Apr 2010) | 9 lines
  
  Merged revisions 259833 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r259833 | qwell | 2010-04-28 15:25:36 -0500 (Wed, 28 Apr 2010) | 1 line
    
    Missed this when removing $ID
  ........
................

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/makeopts.in

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

Modified: branches/1.6.0/makeopts.in
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.0/makeopts.in?view=diff&rev=259840&r1=259839&r2=259840
==============================================================================
--- branches/1.6.0/makeopts.in (original)
+++ branches/1.6.0/makeopts.in Wed Apr 28 15:27:07 2010
@@ -16,7 +16,6 @@
 FIND=@FIND@
 COMPRESS=@COMPRESS@
 BASENAME=@BASENAME@
-ID=@ID@
 SHELL=@SHELL@
 LN=@LN@
 DOT=@DOT@