Olle Johansson 8633f3884f Merged revisions 168712 via svnmerge from ...

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

........
r168712 | oej | 2009-01-15 19:08:59 +0100 (Tor, 15 Jan 2009) | 3 lines

Make sure that we have the same terminology in sip.conf.sample and the source code warning.
Thanks Nick Lewis for pointing this out in the bug tracker.

........


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

2009-01-15 18:14:20 +00:00

..

h323

Merged revisions 129045 via svnmerge from

2008-07-08 16:41:31 +00:00

misdn

Merged revisions 168623 via svnmerge from

2009-01-14 21:54:31 +00:00

xpmr

…

chan_agent.c

Merged revisions 168508 via svnmerge from

2009-01-12 21:01:55 +00:00

chan_alsa.c

Merged revisions 168526 via svnmerge from

2009-01-12 23:46:55 +00:00

chan_console.c

Merged revisions 135439 via svnmerge from

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

chan_dahdi.c

Merged revisions 166382 via svnmerge from

2008-12-22 21:55:59 +00:00

chan_features.c

Merged revisions 160208 via svnmerge from

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

chan_gtalk.c

Merged revisions 139281 via svnmerge from

2008-08-21 10:02:32 +00:00

chan_h323.c

Merged revisions 152969,153122,154264,154268,154366,155399,155863,156166,156295,156690,156756,158066,158082,158540,158602,159276 via svnmerge from

2008-12-02 22:56:36 +00:00

chan_iax2.c

Merged revisions 167265 via svnmerge from

2009-01-06 21:07:20 +00:00

chan_jingle.c

Merged revisions 130129 via svnmerge from

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

chan_local.c

Merged revisions 166954 via svnmerge from

2008-12-31 19:37:03 +00:00

chan_mgcp.c

Merged revisions 152442 via svnmerge from

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

chan_misdn.c

Merged revisions 168562 via svnmerge from

2009-01-13 19:27:54 +00:00

chan_nbs.c

…

chan_oss.c

port gcc 4.3.x warning fixes from trunk to this branch

2008-11-03 00:39:04 +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 168712 via svnmerge from

2009-01-15 18:14:20 +00:00

chan_skinny.c

Merged revisions 152969,153122,154264,154268,154366,155399,155863,156166,156295,156690,156756,158066,158082,158540,158602,159276 via svnmerge from

2008-12-02 22:56:36 +00:00

chan_unistim.c

Merged revisions 168562 via svnmerge from

2009-01-13 19:27:54 +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

…

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

…

DialTone.h

…

iax2-parser.c

Recorded merge of revisions 143031 via svnmerge from

2008-09-13 13:57:05 +00:00

iax2-parser.h

…

iax2-provision.c

Merged revisions 160663 via svnmerge from

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

iax2-provision.h

…

iax2.h

Merged revisions 114884 via svnmerge from

2008-04-30 14:55:16 +00:00

Makefile

Merged revisions 107715 via svnmerge from

2008-03-11 20:51:18 +00:00

misdn_config.c

Merged revisions 166773 via svnmerge from

2008-12-28 15:15:46 +00:00

vcodecs.c

Merged revisions 147807 via svnmerge from

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

vgrabbers.c

…