Automerge Script 0efd501d6b automerge commit ...

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@70946 65c4cc65-6c06-0410-ace0-fbb531ad65f3

2007-06-21 22:25:55 +00:00

..

app_adsiprog.c

remove extraneous svn:executable properties

2005-11-29 18:24:39 +00:00

app_alarmreceiver.c

automerge commit

2006-09-28 18:01:52 +00:00

app_authenticate.c

automerge commit

2006-09-08 17:03:06 +00:00

app_cdr.c

remove extraneous svn:executable properties

2005-11-29 18:24:39 +00:00

app_chanisavail.c

remove extraneous svn:executable properties

2005-11-29 18:24:39 +00:00

app_chanspy.c

merge up to branch 1.2 and re-enable automerge

2007-02-08 22:48:47 +00:00

app_controlplayback.c

remove extraneous svn:executable properties

2005-11-29 18:24:39 +00:00

app_curl.c

automerge commit

2006-10-31 16:02:51 +00:00

app_cut.c

manual update, since automerge is not running at this time

2006-12-12 22:58:49 +00:00

app_datetime.c

remove extraneous svn:executable properties

2005-11-29 18:24:39 +00:00

app_db.c

manual update, since automerge is not running at this time

2006-12-12 22:58:49 +00:00

app_dial.c

automerge commit

2007-06-20 20:26:16 +00:00

app_dictate.c

automerge commit

2007-06-08 23:25:52 +00:00

app_directed_pickup.c

automerge commit

2006-04-06 17:06:45 +00:00

app_directory.c

automerge commit

2007-05-09 15:17:30 +00:00

app_disa.c

remove extraneous svn:executable properties

2005-11-29 18:24:39 +00:00

app_dumpchan.c

automerge commit

2006-06-14 15:06:38 +00:00

app_echo.c

remove extraneous svn:executable properties

2005-11-29 18:24:39 +00:00

app_enumlookup.c

remove extraneous svn:executable properties

2005-11-29 18:24:39 +00:00

app_eval.c

remove extraneous svn:executable properties

2005-11-29 18:24:39 +00:00

app_exec.c

remove extraneous svn:executable properties

2005-11-29 18:24:39 +00:00

app_externalivr.c

manual update, since automerge is not running at this time

2006-12-12 22:58:49 +00:00

app_festival.c

manual update, since automerge is not running at this time

2006-12-12 22:58:49 +00:00

app_flash.c

remove extraneous svn:executable properties

2005-11-29 18:24:39 +00:00

app_forkcdr.c

remove extraneous svn:executable properties

2005-11-29 18:24:39 +00:00

app_getcpeid.c

remove extraneous svn:executable properties

2005-11-29 18:24:39 +00:00

app_groupcount.c

automerge commit

2007-04-25 20:26:05 +00:00

app_hasnewvoicemail.c

automerge commit

2006-09-28 18:01:52 +00:00

app_ices.c

manual update, since automerge is not running at this time

2006-12-12 22:58:49 +00:00

app_image.c

remove extraneous svn:executable properties

2005-11-29 18:24:39 +00:00

app_intercom.c

remove extraneous svn:executable properties

2005-11-29 18:24:39 +00:00

app_ivrdemo.c

remove extraneous svn:executable properties

2005-11-29 18:24:39 +00:00

app_lookupblacklist.c

remove extraneous svn:executable properties

2005-11-29 18:24:39 +00:00

app_lookupcidname.c

remove extraneous svn:executable properties

2005-11-29 18:24:39 +00:00

app_macro.c

automerge commit

2007-05-31 16:14:18 +00:00

app_math.c

automerge commit

2006-09-18 16:02:39 +00:00

app_md5.c

remove extraneous svn:executable properties

2005-11-29 18:24:39 +00:00

app_meetme.c

automerge commit

2007-06-19 14:25:35 +00:00

app_milliwatt.c

automerge commit

2006-01-19 05:00:39 +00:00

app_mixmonitor.c

automerge commit

2007-01-30 00:13:10 +00:00

app_mp3.c

manual update, since automerge is not running at this time

2006-12-12 22:58:49 +00:00

app_nbscat.c

manual update, since automerge is not running at this time

2006-12-12 22:58:49 +00:00

app_osplookup.c

automerge commit

2006-05-17 16:07:08 +00:00

app_page.c

automerge commit

2007-02-20 20:22:54 +00:00

app_parkandannounce.c

remove extraneous svn:executable properties

2005-11-29 18:24:39 +00:00

app_playback.c

automerge commit

2006-09-27 20:01:41 +00:00

app_privacy.c

automerge commit

2006-05-02 03:06:29 +00:00

app_queue.c

automerge commit

2007-05-22 13:09:03 +00:00

app_random.c

automerge commit

2006-08-22 03:00:53 +00:00

app_read.c

remove extraneous svn:executable properties

2005-11-29 18:24:39 +00:00

app_readfile.c

automerge commit

2006-03-23 21:07:45 +00:00

app_realtime.c

remove extraneous svn:executable properties

2005-11-29 18:24:39 +00:00

app_record.c

automerge commit

2007-02-18 13:20:26 +00:00

app_rpt.c

merge up to branch 1.2 and re-enable automerge

2007-02-08 22:48:47 +00:00

app_sayunixtime.c

remove extraneous svn:executable properties

2005-11-29 18:24:39 +00:00

app_senddtmf.c

automerge commit

2006-04-04 16:04:23 +00:00

app_sendtext.c

remove extraneous svn:executable properties

2005-11-29 18:24:39 +00:00

app_setcallerid.c

remove extraneous svn:executable properties

2005-11-29 18:24:39 +00:00

app_setcdruserfield.c

remove extraneous svn:executable properties

2005-11-29 18:24:39 +00:00

app_setcidname.c

remove extraneous svn:executable properties

2005-11-29 18:24:39 +00:00

app_setcidnum.c

remove extraneous svn:executable properties

2005-11-29 18:24:39 +00:00

app_setrdnis.c

remove extraneous svn:executable properties

2005-11-29 18:24:39 +00:00

app_settransfercapability.c

remove extraneous svn:executable properties

2005-11-29 18:24:39 +00:00

app_skel.c

automerge commit

2006-05-01 11:04:46 +00:00

app_sms.c

manual update, since automerge is not running at this time

2006-12-12 22:58:49 +00:00

app_softhangup.c

remove extraneous svn:executable properties

2005-11-29 18:24:39 +00:00

app_sql_postgres.c

automerge commit

2006-05-23 18:05:13 +00:00

app_stack.c

automerge commit

2006-03-29 20:06:56 +00:00

app_system.c

remove extraneous svn:executable properties

2005-11-29 18:24:39 +00:00

app_talkdetect.c

remove extraneous svn:executable properties

2005-11-29 18:24:39 +00:00

app_test.c

automerge commit

2006-06-11 15:04:26 +00:00

app_transfer.c

remove extraneous svn:executable properties

2005-11-29 18:24:39 +00:00

app_txtcidname.c

remove extraneous svn:executable properties

2005-11-29 18:24:39 +00:00

app_url.c

automerge commit

2006-06-11 16:04:09 +00:00

app_userevent.c

remove extraneous svn:executable properties

2005-11-29 18:24:39 +00:00

app_verbose.c

automerge commit

2006-05-04 12:05:58 +00:00

app_voicemail.c

automerge commit

2007-06-21 22:25:55 +00:00

app_waitforring.c

remove extraneous svn:executable properties

2005-11-29 18:24:39 +00:00

app_waitforsilence.c

automerge commit

2006-05-22 22:06:43 +00:00

app_while.c

automerge commit

2007-01-24 01:19:59 +00:00

app_zapateller.c

remove extraneous svn:executable properties

2005-11-29 18:24:39 +00:00

app_zapbarge.c

automerge commit

2006-06-11 15:04:26 +00:00

app_zapras.c

manual update, since automerge is not running at this time

2006-12-12 22:58:49 +00:00

app_zapscan.c

automerge commit

2006-06-11 15:04:26 +00:00

enter.h

remove extraneous svn:executable properties

2005-11-29 18:24:39 +00:00

leave.h

remove extraneous svn:executable properties

2005-11-29 18:24:39 +00:00

Makefile

automerge commit

2006-04-30 14:05:02 +00:00

rpt_flow.pdf

remove extraneous svn:executable properties

2005-11-29 18:24:39 +00:00