Mark Michelson fc446d8649 Merged revisions 144149 via svnmerge from ...

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

........
r144149 | mmichelson | 2008-09-23 18:33:33 -0500 (Tue, 23 Sep 2008) | 3 lines

Fix a conflict in flag values


........


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

2008-09-23 23:36:27 +00:00

..

h323

Swap "static" and "const", so that "static" appears at the beginning of each

2008-07-14 15:44:07 +00:00

misdn

use correct function name... please compile with --enable-dev-mode

2008-07-23 16:38:28 +00:00

xpmr

More RSW merges. This should do it for the channels/ dir.

2008-08-09 14:12:34 +00:00

chan_agent.c

Merged revisions 143609 via svnmerge from

2008-09-19 15:49:19 +00:00

chan_alsa.c

Merge more changes from the resolve-shadow-warnings branch (henceforth known

2008-08-09 12:53:57 +00:00

chan_console.c

Merged revisions 140489 via svnmerge from

2008-08-29 17:48:07 +00:00

chan_dahdi.c

Merged revisions 140205 via svnmerge from

2008-08-26 18:50:47 +00:00

chan_features.c

Merge more changes from the resolve-shadow-warnings branch (henceforth known

2008-08-09 12:53:57 +00:00

chan_gtalk.c

Janitor patch to change uses of sizeof to ARRAY_LEN

2008-07-11 18:09:35 +00:00

chan_h323.c

More expansion of the deadlock avoidance macro, including a macro to do locking

2008-06-25 02:34:11 +00:00

chan_iax2.c

Merged revisions 143141 via svnmerge from

2008-09-15 21:33:02 +00:00

chan_jingle.c

Merge more changes from the resolve-shadow-warnings branch (henceforth known

2008-08-09 12:53:57 +00:00

chan_local.c

Merged revisions 142929 via svnmerge from

2008-09-12 22:25:52 +00:00

chan_mgcp.c

More RSW merges. This should do it for the channels/ dir.

2008-08-09 14:12:34 +00:00

chan_misdn.c

Merged revisions 136241 via svnmerge from

2008-08-07 19:01:03 +00:00

chan_nbs.c

one more place I forgot

2008-05-22 17:50:40 +00:00

chan_oss.c

Merged revisions 141995 via svnmerge from

2008-09-09 10:25:06 +00:00

chan_phone.c

Merge more changes from the resolve-shadow-warnings branch (henceforth known

2008-08-09 12:53:57 +00:00

chan_phone.h

rename DialTone.h to chan_phone.h because chan_phone.c is the only file using it

2008-05-28 20:00:21 +00:00

chan_sip.c

Merged revisions 144149 via svnmerge from

2008-09-23 23:36:27 +00:00

chan_skinny.c

Merged revisions 143082 via svnmerge from

2008-09-14 22:24:29 +00:00

chan_unistim.c

More RSW merges. This should do it for the channels/ dir.

2008-08-09 14:12:34 +00:00

chan_usbradio.c

Split the compile flags out and wire up some dependencies

2008-05-22 21:43:54 +00:00

chan_vpb.cc

Fix trunk breakage

2008-05-22 21:27:00 +00:00

console_board.c

import the recent additions for video console into trunk,

2008-06-29 21:17:14 +00:00

console_gui.c

implement the 'freeze' function for incoming frames;

2008-06-30 15:45:15 +00:00

console_video.c

use ast_pthread_create_detached_background() instead of redoing

2008-07-14 16:50:24 +00:00

console_video.h

implement the 'freeze' function for incoming frames;

2008-06-30 15:45:15 +00:00

iax2-parser.c

Merged revisions 143031 via svnmerge from

2008-09-13 13:58:15 +00:00

iax2-parser.h

Improve native transfers when a chain of IAX2 connections are in use.

2008-05-17 19:39:35 +00:00

iax2-provision.c

Janitor project to convert sizeof to ARRAY_LEN macro.

2008-07-08 16:40:28 +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

Merge changes from team/bbryant/keyrotation

2008-08-01 18:16:24 +00:00

Makefile

Bring all app_rpt and chan_usbradio stuff up to date

2008-05-16 00:51:14 +00:00

misdn_config.c

Merged revisions 136241 via svnmerge from

2008-08-07 19:01:03 +00:00

vcodecs.c

make this compile after ast_frame's data field changed to a union

2008-06-29 12:45:59 +00:00

vgrabbers.c

free memory used by the x11 grabber when closing it.

2008-07-14 16:50:54 +00:00