Mark Michelson 1e4f1aff0c Merged revisions 174327 via svnmerge from ...

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

........
r174327 | mmichelson | 2009-02-09 11:27:32 -0600 (Mon, 09 Feb 2009) | 3 lines

Fix something I messed up in the merge I just did


........


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

2009-02-09 17:30:33 +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

Merged revisions 168623 via svnmerge from

2009-01-14 21:55:43 +00:00

xpmr

Merged revisions 159050 via svnmerge from

2008-11-25 05:05:18 +00:00

chan_agent.c

Merged revisions 171691 via svnmerge from

2009-01-27 22:01:52 +00:00

chan_alsa.c

Merged revisions 168526 via svnmerge from

2009-01-12 23:47:52 +00:00

chan_console.c

Merged revisions 157039 via svnmerge from

2008-11-15 04:09:13 +00:00

chan_dahdi.c

Merged revisions 174041 via svnmerge from

2009-02-06 19:30:29 +00:00

chan_features.c

Merged revisions 160208 via svnmerge from

2008-12-02 00:58:43 +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

Merged revisions 170501 via svnmerge from

2009-01-23 17:49:55 +00:00

chan_iax2.c

Merged revisions 173502 via svnmerge from

2009-02-04 21:32:32 +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 169211 via svnmerge from

2009-01-19 15:55:29 +00:00

chan_mgcp.c

Merged revisions 152442 via svnmerge from

2008-10-28 21:40:06 +00:00

chan_misdn.c

Merged revisions 168562 via svnmerge from

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

chan_nbs.c

one more place I forgot

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

chan_oss.c

Merged revisions 171188 via svnmerge from

2009-01-26 00:04:28 +00:00

chan_phone.c

Merged revisions 160170-160172 via svnmerge from

2008-12-01 23:53:18 +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 174327 via svnmerge from

2009-02-09 17:30:33 +00:00

chan_skinny.c

Merged revisions 168562 via svnmerge from

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

chan_unistim.c

Merged revisions 168562 via svnmerge from

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

chan_usbradio.c

Merged revisions 159050 via svnmerge from

2008-11-25 05:05:18 +00:00

chan_vpb.cc

Merged revisions 159818 via svnmerge from

2008-11-29 18:16:50 +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

Merged revisions 147807 via svnmerge from

2008-10-09 15:06:21 +00:00

console_video.c

Merged revisions 147807 via svnmerge from

2008-10-09 15:06:21 +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

Merged revisions 173502 via svnmerge from

2009-02-04 21:32:32 +00:00

iax2-provision.c

Merged revisions 160663 via svnmerge from

2008-12-03 19:49:36 +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 166773 via svnmerge from

2008-12-28 15:16:11 +00:00

vcodecs.c

Merged revisions 147807 via svnmerge from

2008-10-09 15:06:21 +00:00

vgrabbers.c

free memory used by the x11 grabber when closing it.

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