Jason Parker 4b1f9488f4 Merged revisions 262422 via svnmerge from ...

https://origsvn.digium.com/svn/asterisk/trunk

................
  r262422 | qwell | 2010-05-11 14:57:24 -0500 (Tue, 11 May 2010) | 18 lines
  
  Merged revisions 262421 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r262421 | qwell | 2010-05-11 14:55:42 -0500 (Tue, 11 May 2010) | 11 lines
    
    Use a less silly method for modifying a flex-generated file.
    
    The sed syntax that was used wasn't actually valid, causing some versions to
    choke.  This is the method that is used in 1.6.x+ for similar changes.
    
    (closes issue #16696)
    Reported by: bklang
    Patches: 
          16696-sedfix.diff uploaded by qwell (license 4)
    Tested by: qwell
  ........
................


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

2010-05-11 19:58:14 +00:00

..

ael

Merged revisions 222273 via svnmerge from

2009-10-06 19:20:22 +00:00

ais

Merged revisions 184630 via svnmerge from

2009-03-27 14:04:56 +00:00

snmp

AST-2009-005

2009-08-10 19:30:55 +00:00

Makefile

Merged revisions 262422 via svnmerge from

2010-05-11 19:58:14 +00:00

res_adsi.c

All of the res/ stuff (other than res_jabber) from the RSW branch.

2008-08-10 00:47:56 +00:00

res_ael_share.c

remove a bunch of useless #include "options.h"

2007-11-21 23:09:02 +00:00

res_agi.c

Merged revisions 254446 via svnmerge from

2010-03-25 15:22:09 +00:00

res_ais.c

Merged revisions 179164 via svnmerge from

2009-02-27 21:48:00 +00:00

res_clioriginate.c

Merged revisions 102378 via svnmerge from

2008-02-05 15:10:36 +00:00

res_config_curl.c

AST-2009-005

2009-08-10 19:30:55 +00:00

res_config_ldap.c

Merged revisions 240271 via svnmerge from

2010-01-14 23:18:34 +00:00

res_config_odbc.c

Merged revisions 217638 via svnmerge from

2009-09-10 18:18:39 +00:00

res_config_pgsql.c

reverting changes made by r229095 as they are not applicable to 1.6.1

2009-11-10 15:36:10 +00:00

res_config_sqlite.c

AST-2009-005

2009-08-10 19:30:55 +00:00

res_convert.c

Merged revisions 196843 via svnmerge from

2009-05-26 18:30:04 +00:00

res_crypto.c

Merged revisions 205120 via svnmerge from

2009-07-08 15:29:10 +00:00

res_curl.c

Separate the global initialization routines for cURL into its own separate

2008-06-25 16:00:54 +00:00

res_http_post.c

Merged revisions 226099 via svnmerge from

2009-10-27 17:04:41 +00:00

res_indications.c

Merged revisions 168562 via svnmerge from

2009-01-13 19:35:59 +00:00

res_jabber.c

Merged revisions 209098 via svnmerge from

2009-07-27 20:28:28 +00:00

res_limit.c

Merged revisions 217033 via svnmerge from

2009-09-08 15:36:01 +00:00

res_monitor.c

Merged revisions 258776 via svnmerge from

2010-04-25 18:14:09 +00:00

res_musiconhold.c

Merged revisions 260346 via svnmerge from

2010-04-30 20:18:31 +00:00

res_odbc.c

Merged revisions 222176 via svnmerge from

2009-10-06 01:36:36 +00:00

res_phoneprov.c

Merged revisions 222176 via svnmerge from

2009-10-06 01:36:36 +00:00

res_realtime.c

Merged revisions 165318 via svnmerge from

2008-12-17 21:25:32 +00:00

res_smdi.c

AST-2009-005

2009-08-10 19:30:55 +00:00

res_snmp.c

remove a bunch of useless #include "options.h"

2007-11-21 23:09:02 +00:00

res_speech.c

Merged revisions 247841 via svnmerge from

2010-02-18 23:15:11 +00:00

res_timing_dahdi.c

Merged revisions 199743 via svnmerge from

2009-06-09 16:33:31 +00:00

res_timing_pthread.c

Merged revisions 199743 via svnmerge from

2009-06-09 16:33:31 +00:00