kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-06 01:45:11 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
eb079909bc9f74ed35060a929f790857d431ddfa
asterisk/channels
History
Richard Mudgett 5d29635bc5 Fix merge error caused by merging -r132883 and -r121770 from 
https://origsvn.digium.com/svn/asterisk/trunk out of order.

(closes issue #13788)
Reported by: IgorG

(closes issue #13491)
Reported by: avalentin


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@168607 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-01-14 19:20:29 +00:00
..
h323
Merged revisions 129045 via svnmerge from
2008-07-08 16:41:31 +00:00
misdn
Fix merge error caused by merging -r132883 and -r121770 from
2009-01-14 19:20:29 +00:00
xpmr
Allow chan_usbradio to compile again.
2007-10-17 16:09:01 +00:00
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
remove another set of redundant #include "asterisk/options.h"
2007-11-21 23:24:55 +00:00
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 168578 via svnmerge from
2009-01-13 22:31: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
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
Recorded merge of revisions 143031 via svnmerge from
2008-09-13 13:57:05 +00:00
iax2-parser.h
Merged revisions 75445 via svnmerge from
2007-07-17 20:49:09 +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 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
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