Commit 97d6de5b authored May 04, 2001 by Ralf S. Engelschall

Resolve conflicts after import.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88994 13f79535-47bb-0310-9956-ffa450edef68

parent 7e5c3596

modules/ssl/.cvsignore

+3 −7

Original line number	Diff line number	Diff line
		.deps
		.libs
		*.la
		modules.mk
		.deps
		Makefile
		modules.mk
		*.lo
		*.slo
		*.so
		Debug
		Release
		*.la

modules/ssl/.indent.pro

deleted100644 → 0

+0 −54

Original line number	Diff line number	Diff line
		-i4 -npsl -di0 -br -nce -d0 -cli0 -npcs -nfc1
		-TBUFF
		-TFILE
		-TTRANS
		-TUINT4
		-T_trans
		-Tallow_options_t
		-Tapache_sfio
		-Tarray_header
		-Tbool_int
		-Tbuf_area
		-Tbuff_struct
		-Tbuffy
		-Tcmd_how
		-Tcmd_parms
		-Tcommand_rec
		-Tcommand_struct
		-Tconn_rec
		-Tcore_dir_config
		-Tcore_server_config
		-Tdir_maker_func
		-Tevent
		-Tglobals_s
		-Thandler_func
		-Thandler_rec
		-Tjoblist_s
		-Tlisten_rec
		-Tmerger_func
		-Tmode_t
		-Tmodule
		-Tmodule_struct
		-Tmutex
		-Tn_long
		-Tother_child_rec
		-Toverrides_t
		-Tparent_score
		-Tpid_t
		-Tpiped_log
		-Tpool
		-Trequest_rec
		-Trequire_line
		-Trlim_t
		-Tscoreboard
		-Tsemaphore
		-Tserver_addr_rec
		-Tserver_rec
		-Tserver_rec_chain
		-Tshort_score
		-Ttable
		-Ttable_entry
		-Tthread
		-Tu_wide_int
		-Tvtime_t
		-Twide_int