aboutsummaryrefslogtreecommitdiffstats
path: root/res
AgeCommit message (Collapse)AuthorFilesLines
2007-08-02automerge commitautomerge1-1/+2
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@77937 f38db490-d61c-443f-a65b-d21fe96a405b
2007-07-13automerge commitautomerge1-2/+2
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@75155 f38db490-d61c-443f-a65b-d21fe96a405b
2007-07-13automerge commitautomerge1-0/+2
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@75106 f38db490-d61c-443f-a65b-d21fe96a405b
2007-07-12automerge commitautomerge1-8/+9
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@74863 f38db490-d61c-443f-a65b-d21fe96a405b
2007-07-11automerge commitautomerge1-10/+8
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@74702 f38db490-d61c-443f-a65b-d21fe96a405b
2007-07-10sync with 1.2 branchrussell1-2/+4
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@74320 f38db490-d61c-443f-a65b-d21fe96a405b
2007-07-09automerge commitautomerge1-9/+9
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@74210 f38db490-d61c-443f-a65b-d21fe96a405b
2007-07-06automerge commitautomerge1-0/+4
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@73725 f38db490-d61c-443f-a65b-d21fe96a405b
2007-06-25automerge commitautomerge1-1/+1
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@71703 f38db490-d61c-443f-a65b-d21fe96a405b
2007-06-22automerge commitautomerge1-0/+1
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@71173 f38db490-d61c-443f-a65b-d21fe96a405b
2007-06-22automerge commitautomerge1-16/+2
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@71119 f38db490-d61c-443f-a65b-d21fe96a405b
2007-06-19automerge commitautomerge1-2/+2
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@69893 f38db490-d61c-443f-a65b-d21fe96a405b
2007-05-03automerge commitautomerge1-1/+1
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@62882 f38db490-d61c-443f-a65b-d21fe96a405b
2007-05-03automerge commitautomerge1-13/+13
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@62840 f38db490-d61c-443f-a65b-d21fe96a405b
2007-05-01automerge commitautomerge1-1/+1
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@62592 f38db490-d61c-443f-a65b-d21fe96a405b
2007-03-29automerge commitautomerge1-9/+2
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@59354 f38db490-d61c-443f-a65b-d21fe96a405b
2007-03-21automerge commitautomerge1-0/+1
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@59137 f38db490-d61c-443f-a65b-d21fe96a405b
2007-02-16automerge commitautomerge1-1/+1
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@54821 f38db490-d61c-443f-a65b-d21fe96a405b
2007-02-08merge up to branch 1.2 and re-enable automergekpfleming1-12/+13
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@53671 f38db490-d61c-443f-a65b-d21fe96a405b
2007-01-23automerge commitautomerge1-0/+6
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@51557 f38db490-d61c-443f-a65b-d21fe96a405b
2007-01-22automerge commitautomerge1-0/+2
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@51403 f38db490-d61c-443f-a65b-d21fe96a405b
2006-12-12manual update, since automerge is not running at this timekpfleming4-30/+52
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@48421 f38db490-d61c-443f-a65b-d21fe96a405b
2006-11-02automerge commitroot1-0/+4
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@46990 f38db490-d61c-443f-a65b-d21fe96a405b
2006-11-01automerge commitroot1-1/+1
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@46821 f38db490-d61c-443f-a65b-d21fe96a405b
2006-11-01automerge commitroot1-1/+19
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@46800 f38db490-d61c-443f-a65b-d21fe96a405b
2006-10-31automerge commitroot1-2/+2
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@46581 f38db490-d61c-443f-a65b-d21fe96a405b
2006-10-30automerge commitroot2-3/+3
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@46427 f38db490-d61c-443f-a65b-d21fe96a405b
2006-09-28automerge commitroot3-4/+4
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@43931 f38db490-d61c-443f-a65b-d21fe96a405b
2006-09-27automerge commitroot1-6/+7
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@43791 f38db490-d61c-443f-a65b-d21fe96a405b
2006-09-06automerge commitroot1-1/+2
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@42169 f38db490-d61c-443f-a65b-d21fe96a405b
2006-08-23automerge commitroot1-4/+5
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@40920 f38db490-d61c-443f-a65b-d21fe96a405b
2006-08-15automerge commitroot1-5/+4
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@39962 f38db490-d61c-443f-a65b-d21fe96a405b
2006-08-03automerge commitroot1-1/+1
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@38849 f38db490-d61c-443f-a65b-d21fe96a405b
2006-08-02automerge commitroot1-0/+1
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@38709 f38db490-d61c-443f-a65b-d21fe96a405b
2006-08-01automerge commitroot1-0/+4
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@38675 f38db490-d61c-443f-a65b-d21fe96a405b
2006-07-31automerge commitroot1-0/+3
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@38605 f38db490-d61c-443f-a65b-d21fe96a405b
2006-07-12automerge commitroot1-5/+0
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@37432 f38db490-d61c-443f-a65b-d21fe96a405b
2006-06-12automerge commitroot1-1/+0
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@33723 f38db490-d61c-443f-a65b-d21fe96a405b
2006-06-12automerge commitroot1-3/+3
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@33642 f38db490-d61c-443f-a65b-d21fe96a405b
2006-06-03automerge commitroot1-0/+2
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@31807 f38db490-d61c-443f-a65b-d21fe96a405b
2006-06-01automerge commitroot1-12/+2
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@31585 f38db490-d61c-443f-a65b-d21fe96a405b
2006-06-01automerge commitroot1-2/+7
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@31224 f38db490-d61c-443f-a65b-d21fe96a405b
2006-05-24automerge commitroot1-0/+6
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@30001 f38db490-d61c-443f-a65b-d21fe96a405b
2006-05-23automerge commitroot1-2/+1
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@29762 f38db490-d61c-443f-a65b-d21fe96a405b
2006-05-23automerge commitroot1-3/+4
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@29702 f38db490-d61c-443f-a65b-d21fe96a405b
2006-05-22automerge commitroot1-1/+1
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@29551 f38db490-d61c-443f-a65b-d21fe96a405b
2006-05-21automerge commitroot1-3/+10
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@29233 f38db490-d61c-443f-a65b-d21fe96a405b
2006-05-08automerge commitroot1-2/+2
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@25486 f38db490-d61c-443f-a65b-d21fe96a405b
2006-05-01automerge commitroot1-0/+4
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@24049 f38db490-d61c-443f-a65b-d21fe96a405b
2006-04-17automerge commitroot1-0/+21
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@21001 f38db490-d61c-443f-a65b-d21fe96a405b