summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2011-07-22Merge branch 'master' of 192.168.0.100:/repos/git/asteriskHEADmasterPatrick McHardy383-1713/+4762
2011-07-21Merged revisions 329257 via svnmerge from russell6-29/+29
2011-07-21Merged revisions 329204 via svnmerge from rmudgett2-8/+8
2011-07-21Merged revisions 329200 via svnmerge from rmudgett1-3/+5
2011-07-21Merged revisions 329145 via svnmerge from rmudgett1-2/+0
2011-07-21Fix UPGRADE.txt files for Asterisk 10.qwell2-4/+4
2011-07-21Remove another 2.0 property.qwell0-0/+0
2011-07-21Fix merge properties to reflect Asterisk 10 branchrussell0-0/+0
2011-07-20Merged revisions 329055 via svnmerge from pabelanger1-0/+2
2011-07-20Merged revisions 328992 via svnmerge from twilson1-1/+0
2011-07-20Merged revisions 328936 via svnmerge from kmoore1-10/+2
2011-07-19Merged revisions 328879 via svnmerge from kpfleming3-46/+31
2011-07-19Edit the merge properties to match their names.kpfleming0-0/+0
2011-07-19Fix properties after twilson's change so merges still workrussell0-0/+0
2011-07-19Merged revisions 328824 via svnmerge from kmoore4-18/+34
2011-07-19Merged revisions 328771 via svnmerge from kmoore1-9/+7
2011-07-19Merged revisions 328717 via svnmerge from twilson2-2/+222
2011-07-18Merged revisions 328664 via svnmerge from markm1-1/+2
2011-07-18Merged revisions 328611 via svnmerge from markm1-0/+5
2011-07-18Merged revisions 328609 via svnmerge from markm1-8/+23
2011-07-18Merged revisions 328541 via svnmerge from tilghman1-1/+1
2011-07-15Merged revisions 328428-328429 via svnmerge from may1-5/+27
2011-07-15Merged revisions 328451 via svnmerge from lmadsen1-1/+0
2011-07-15Merged revisions 328448 via svnmerge from lmadsen3-2/+27
2011-07-15Add SLA to skinny.wedhorn1-118/+630
2011-07-15Merged revisions 328329 via svnmerge from rmudgett6-8/+8
2011-07-14Merged revisions 328317 via svnmerge from rmudgett1-1/+3
2011-07-14Merged revisions 328247 via svnmerge from lmadsen286-10/+834
2011-07-14Merged revisions 328207 via svnmerge from jrose1-7/+3
2011-07-14Merged revisions 328162 via svnmerge from mnicholson1-2/+2
2011-07-13Merged revisions 328120 via svnmerge from dvossel1-5/+19
2011-07-13Add UPGRADE-1.10.txt file from UPGRADE.txt.lmadsen3-1/+77
2011-07-13set 1.10 merge propertiesrussell0-0/+0
2011-07-13remove 1.8 merge propertiesrussell0-0/+0
2011-07-13Merged revisions 328014 via svnmerge from rmudgett1-0/+4
2011-07-12Merged revisions 327950 via svnmerge from kpfleming1-6/+6
2011-07-12Merged revisions 327890 via svnmerge from mnicholson1-4/+5
2011-07-12Merged revisions 327888 via svnmerge from qwell1-1/+1
2011-07-12Merged revisions 327852 via svnmerge from mjordan1-2/+30
2011-07-12Merged revisions 327793 via svnmerge from tilghman1-2/+2
2011-07-12do v21 detection instead of CED detection for the fax gatewaymnicholson3-45/+170
2011-07-12Send video update frame to new video source in follow_talker correctly.dvossel1-0/+1
2011-07-12Segfault on shutdown when confbridge is activekmoore1-0/+7
2011-07-11use printf instead of echo -n in substitution testmnicholson1-2/+2
2011-07-11Merged revisions 327682 via svnmerge from twilson2-1/+9
2011-07-11Updates follow_talker video_mode in confbridge application.dvossel3-7/+87
2011-07-11renamed fax_gateway_send_ced() to fax_gateway_request_t38()mnicholson1-5/+5
2011-07-11actually do something with the ced timeout, also added more debug outputmnicholson1-7/+12
2011-07-11write silence on the channel during t.38 negotiationmnicholson1-2/+15
2011-07-11Merged revisions 327512 via svnmerge from mnicholson2-0/+4