Jeff Peeler 8d49fb4502 Merged revisions 208383 via svnmerge from ...

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

................
  r208383 | jpeeler | 2009-07-23 14:21:50 -0500 (Thu, 23 Jul 2009) | 12 lines
  
  Merged revisions 208380 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r208380 | jpeeler | 2009-07-23 14:19:53 -0500 (Thu, 23 Jul 2009) | 6 lines
    
    Only set the priindication setting when not performing a reload
    
    (closes issue #14696)
    Reported by: fdecher
  ........
................


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

2009-07-23 19:23:33 +00:00

..

h323

Merged revisions 201678 via svnmerge from

2009-06-18 16:58:03 +00:00

misdn

Merged revisions 145293,158010 from

2009-07-18 01:35:06 +00:00

xpmr

Allow chan_usbradio to compile again.

2007-10-17 16:09:01 +00:00

chan_agent.c

Merged revisions 189204 via svnmerge from

2009-04-18 01:37:24 +00:00

chan_alsa.c

Merged revisions 196988 via svnmerge from

2009-05-27 13:04:10 +00:00

chan_console.c

Merged revisions 135439 via svnmerge from

2008-08-04 15:02:44 +00:00

chan_dahdi.c

Merged revisions 208383 via svnmerge from

2009-07-23 19:23:33 +00:00

chan_features.c

Merged revisions 160208 via svnmerge from

2008-12-02 00:57:31 +00:00

chan_gtalk.c

Merged revisions 185363 via svnmerge from

2009-03-31 17:36:07 +00:00

chan_h323.c

Merged revisions 191219 via svnmerge from

2009-04-29 23:14:51 +00:00

chan_iax2.c

Merged revisions 206386 via svnmerge from

2009-07-14 14:54:47 +00:00

chan_jingle.c

Merged revisions 130129 via svnmerge from

2008-07-11 18:14:27 +00:00

chan_local.c

Merged revisions 190287 via svnmerge from

2009-04-23 19:16:32 +00:00

chan_mgcp.c

Merged revisions 152442 via svnmerge from

2008-10-28 21:39:35 +00:00

chan_misdn.c

Merged revisions 145293,158010 from

2009-07-18 01:35:06 +00:00

chan_nbs.c

remove another set of redundant #include "asterisk/options.h"

2007-11-21 23:24:55 +00:00

chan_oss.c

Merged revisions 171188 via svnmerge from

2009-01-26 00:03:37 +00:00

chan_phone.c

Merged revisions 160170-160172 via svnmerge from

2008-12-01 23:41:16 +00:00

chan_sip.c

Merged revisions 208314 via svnmerge from

2009-07-23 16:30:00 +00:00

chan_skinny.c

Merged revisions 182847 via svnmerge from

2009-03-18 14:24:27 +00:00

chan_unistim.c

Merged revisions 192938 via svnmerge from

2009-05-07 17:14:26 +00:00

chan_usbradio.c

Merged revisions 158992 via svnmerge from

2008-11-25 04:05:31 +00:00

chan_vpb.cc

Merged revisions 159818 via svnmerge from

2008-11-29 18:37:55 +00:00

console_board.c

The fixes in this commit are mainly to allow compiling of trunk with --enable-dev-mode, mutex profiling, lock debugging, etc. Mainly, the version.c needs to be in the OBJS line; asterisk.h was chosen to have the prototypes for ast_get_version, ast_get_version_num; and the ASTERISK_FILE_VERSION macro needs to be used after including asterisk.h in a few files. I hope I did the right thing. If not, let me know.

2008-01-10 00:50:39 +00:00

console_gui.c

Merged revisions 147807 via svnmerge from

2008-10-09 14:56:51 +00:00

console_video.c

Merged revisions 147807 via svnmerge from

2008-10-09 14:56:51 +00:00

console_video.h

Two changes:

2008-01-09 18:03:40 +00:00

DialTone.h

Doxygen updates, formatting.

2007-12-11 22:20:22 +00:00

iax2-parser.c

Merged revisions 194833 via svnmerge from

2009-05-15 21:08:26 +00:00

iax2-parser.h

Merged revisions 194833 via svnmerge from

2009-05-15 21:08:26 +00:00

iax2-provision.c

Merged revisions 160663 via svnmerge from

2008-12-03 20:02:21 +00:00

iax2-provision.h

Don't reload a configuration file if nothing has changed.

2007-08-16 21:09:46 +00:00

iax2.h

Merged revisions 194833 via svnmerge from

2009-05-15 21:08:26 +00:00

Makefile

Merged revisions 207680 via svnmerge from

2009-07-21 13:39:44 +00:00

misdn_config.c

Merged revisions 145293,158010 from

2009-07-18 01:35:06 +00:00

vcodecs.c

Merged revisions 147807 via svnmerge from

2008-10-09 14:56:51 +00:00

vgrabbers.c

The fixes in this commit are mainly to allow compiling of trunk with --enable-dev-mode, mutex profiling, lock debugging, etc. Mainly, the version.c needs to be in the OBJS line; asterisk.h was chosen to have the prototypes for ast_get_version, ast_get_version_num; and the ASTERISK_FILE_VERSION macro needs to be used after including asterisk.h in a few files. I hope I did the right thing. If not, let me know.

2008-01-10 00:50:39 +00:00