diff options
| author | Automerge script <automerge@asterisk.org> | 2012-12-05 03:19:08 +0000 |
|---|---|---|
| committer | Automerge script <automerge@asterisk.org> | 2012-12-05 03:19:08 +0000 |
| commit | 521f9e8dfee50c2d81aa27839c7fce4e5ecda5a0 (patch) | |
| tree | 040e3ef9e458d2da716a9ecb12958291313ef0f3 /include | |
| parent | 02e9f9fdd7b0d819e393572e1a9810df88875e06 (diff) | |
Merged revisions 377245-377246 via svnmerge from
file:///srv/subversion/repos/asterisk/trunk
................
r377245 | rmudgett | 2012-12-04 20:20:57 -0600 (Tue, 04 Dec 2012) | 8 lines
Fix registering core show codecs/codec CLI commands twice.
........
Merged revisions 377241 from http://svn.asterisk.org/svn/asterisk/branches/10
........
Merged revisions 377244 from http://svn.asterisk.org/svn/asterisk/branches/11
................
r377246 | rmudgett | 2012-12-04 20:23:10 -0600 (Tue, 04 Dec 2012) | 1 line
Remove init_framer(). It no longer does anything.
................
git-svn-id: https://origsvn.digium.com/svn/asterisk/team/mmichelson/threadpool@377251 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'include')
| -rw-r--r-- | include/asterisk/_private.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/asterisk/_private.h b/include/asterisk/_private.h index a7ed68136..cded90ef7 100644 --- a/include/asterisk/_private.h +++ b/include/asterisk/_private.h @@ -20,7 +20,6 @@ int load_pbx(void); /*!< Provided by pbx.c */ int init_logger(void); /*!< Provided by logger.c */ void close_logger(void); /*!< Provided by logger.c */ void clean_time_zones(void); /*!< Provided by localtime.c */ -int init_framer(void); /*!< Provided by frame.c */ int ast_term_init(void); /*!< Provided by term.c */ int astdb_init(void); /*!< Provided by db.c */ void ast_channels_init(void); /*!< Provided by channel.c */ |