kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-08 10:58:15 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
6a1c421db97d722fd32c79dbdeb9d8e27a10948d
asterisk/channels
History
Mark Michelson f30f904099 Merged revisions 186837 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
  r186837 | mmichelson | 2009-04-07 19:01:49 -0500 (Tue, 07 Apr 2009) | 7 lines
  
  Fix bad merge from fix for issue 13867.
  
  (closes issue #14686)
  Reported by: davidw
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@186838 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2009-04-08 00:02:19 +00:00
..
h323
Merged revisions 184910 via svnmerge from
2009-03-30 13:56:57 +00:00
misdn
Merged revisions 185122 via svnmerge from
2009-03-30 20:46:24 +00:00
xpmr
Allow chan_usbradio to compile again.
2007-10-17 16:09:01 +00:00
chan_agent.c
Merged revisions 171691 via svnmerge from
2009-01-27 22:00:44 +00:00
chan_alsa.c
Merged revisions 182847 via svnmerge from
2009-03-18 14:24:27 +00:00
chan_console.c
Merged revisions 135439 via svnmerge from
2008-08-04 15:02:44 +00:00
chan_dahdi.c
Merged revisions 186461 via svnmerge from
2009-04-03 20:20:52 +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 182722 via svnmerge from
2009-03-17 20:51:06 +00:00
chan_iax2.c
Merged revisions 184037 via svnmerge from
2009-03-24 21:43:35 +00:00
chan_jingle.c
Merged revisions 130129 via svnmerge from
2008-07-11 18:14:27 +00:00
chan_local.c
Merged revisions 182211 via svnmerge from
2009-03-16 16:09:11 +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
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 186837 via svnmerge from
2009-04-08 00:02:19 +00:00
chan_skinny.c
Merged revisions 182847 via svnmerge from
2009-03-18 14:24:27 +00:00
chan_unistim.c
Merged revisions 175952 via svnmerge from
2009-02-16 09:40:22 +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 181371 via svnmerge from
2009-03-11 17:37:25 +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 184838 via svnmerge from
2009-03-29 05:43:28 +00:00
misdn_config.c
Merged revisions 185123 via svnmerge from
2009-03-30 20:48:08 +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