]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Merge "core: Create main/options.c." into 15
authorJenkins2 <jenkins2@gerrit.asterisk.org>
Mon, 2 Apr 2018 13:25:45 +0000 (08:25 -0500)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Mon, 2 Apr 2018 13:25:45 +0000 (08:25 -0500)
1  2 
main/asterisk.c

diff --cc main/asterisk.c
Simple merge