From: Jason Parker <jparker@digium.com>
Date: Wed, 28 Apr 2010 20:27:07 +0000 (+0000)
Subject: Merged revisions 259837 via svnmerge from
X-Git-Tag: 1.6.0.28-rc1~20
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d0b6ca8bede2111a953c584253f180d58524183e;p=thirdparty%2Fasterisk.git

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
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@259840 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/makeopts.in b/makeopts.in
index cb21014eb5..19e089891d 100644
--- a/makeopts.in
+++ b/makeopts.in
@@ -16,7 +16,6 @@ RANLIB=@RANLIB@
 FIND=@FIND@
 COMPRESS=@COMPRESS@
 BASENAME=@BASENAME@
-ID=@ID@
 SHELL=@SHELL@
 LN=@LN@
 DOT=@DOT@