Commit Graph

441 Commits

Author SHA1 Message Date
Automerge Script
98e4e37123 automerge commit
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@75976 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-07-19 16:29:34 +00:00
Automerge Script
51c1456d6b automerge commit
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@75797 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-07-18 21:29:47 +00:00
Russell Bryant
40ef94cfe6 get branch up to date to include ASA fixes
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@75462 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-07-17 21:09:39 +00:00
Automerge Script
6cf12e669e automerge commit
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@74811 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-07-11 23:27:32 +00:00
Automerge Script
09088bc7cc automerge commit
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@72662 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-06-29 17:17:36 +00:00
Automerge Script
43d3d20de0 automerge commit
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@65730 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-05-23 21:23:10 +00:00
Automerge Script
9898fcd5b8 automerge commit
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@63836 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-05-10 23:19:20 +00:00
Automerge Script
fa0aba61e8 automerge commit
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@62733 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-05-02 18:18:44 +00:00
Automerge Script
0ce8de0404 automerge commit
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@62081 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-04-26 17:21:20 +00:00
Automerge Script
09bf2e006f automerge commit
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@61912 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-04-25 22:18:28 +00:00
Automerge Script
f309e69638 automerge commit
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@59413 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-03-29 18:54:38 +00:00
Automerge Script
c23816ba19 automerge commit
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@59354 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-03-29 17:04:00 +00:00
Automerge Script
3951e4addf automerge commit
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@58284 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-03-07 19:05:38 +00:00
Automerge Script
131fcf61e6 automerge commit
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@56455 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-02-23 21:26:04 +00:00
Kevin P. Fleming
dd0edc0f9c merge up to branch 1.2 and re-enable automerge
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@53671 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-02-08 22:48:47 +00:00
Automerge Script
ff730c46b0 automerge commit
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@52806 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-01-30 01:13:13 +00:00
Automerge Script
263d1100fd automerge commit
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@52369 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-01-27 00:07:40 +00:00
Automerge Script
325d362076 automerge commit
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@49921 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-01-08 06:08:16 +00:00
Automerge Script
f7e49a14fd automerge commit
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@49667 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-01-05 18:09:06 +00:00
Automerge Script
6459d34ade automerge commit
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@49131 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2007-01-02 01:15:10 +00:00
Kevin P. Fleming
05f6188c69 manual update, since automerge is not running at this time
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@48421 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-12-12 22:58:49 +00:00
Automerge script
0485f6b149 automerge commit
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@45065 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-10-13 17:02:15 +00:00
Automerge script
d4026a11b1 automerge commit
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@43563 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-09-24 14:01:51 +00:00
Automerge script
60b84e7a31 automerge commit
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@43023 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-09-16 08:01:02 +00:00
Automerge script
942974c8df automerge commit
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@42107 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-09-06 16:06:48 +00:00
Automerge script
aada1f902b automerge commit
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@41432 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-08-30 19:03:07 +00:00
Automerge script
ee2918d783 automerge commit
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@38927 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-08-05 06:04:09 +00:00
Automerge script
4dc5c42b30 automerge commit
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@38346 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-07-27 05:02:49 +00:00
Automerge script
ebdb3d95b2 automerge commit
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@37972 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-07-19 18:03:16 +00:00
Automerge script
afb25c2c40 automerge commit
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@37455 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-07-12 16:02:19 +00:00
Automerge script
94755549d7 automerge commit
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@37432 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-07-12 14:02:32 +00:00
Automerge script
9fe475f0df automerge commit
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@37395 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-07-11 20:02:43 +00:00
Automerge script
fd757fcf51 automerge commit
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@36750 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-07-03 05:04:12 +00:00
Automerge script
0af302cf60 automerge commit
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@34661 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-06-18 21:04:55 +00:00
Automerge script
5b7b71ebc9 automerge commit
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@34432 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-06-16 04:07:04 +00:00
Automerge script
4d1ed8bde0 automerge commit
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@34192 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-06-14 23:11:07 +00:00
Automerge script
62866c9fda automerge commit
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@33327 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-06-09 19:04:18 +00:00
Automerge script
ec8919adcf automerge commit
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@32844 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-06-07 18:04:56 +00:00
Automerge script
e89976c879 automerge commit
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@32595 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-06-06 16:05:13 +00:00
Automerge script
bc79efe36f automerge commit
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@32400 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-06-05 20:04:59 +00:00
Automerge script
0a4881b51f automerge commit
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@29877 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-05-23 22:05:06 +00:00
Automerge script
142165cb92 automerge commit
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@28933 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-05-20 01:07:21 +00:00
Automerge script
7b5e3d8fd5 automerge commit
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@28015 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-05-17 23:08:25 +00:00
Automerge script
8192165970 automerge commit
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@23734 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-04-30 16:05:12 +00:00
Automerge script
2648e9f039 automerge commit
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@16797 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-03-31 20:03:56 +00:00
Automerge script
15e7ec94e1 automerge commit
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@16770 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-03-31 19:04:28 +00:00
Automerge script
fd1d8cdf10 automerge commit
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@15742 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-03-28 20:06:56 +00:00
Automerge script
c9d7d267cd automerge commit
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@13673 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-03-20 19:07:11 +00:00
Automerge script
490cd4ada5 automerge commit
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@11434 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-02-28 20:04:13 +00:00
Automerge script
b055431b5c automerge commit
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@10534 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-02-20 06:03:40 +00:00