diff options
| author | Ralf S. Engelschall <rse@apache.org> | 2001-05-05 00:07:34 +0200 |
|---|---|---|
| committer | Ralf S. Engelschall <rse@apache.org> | 2001-05-05 00:07:34 +0200 |
| commit | 07e51cc45d53965ddac3d8e062338e07ba474ec6 (patch) | |
| tree | beac8a5aaf821506a6a73437cd8bab3aafefb50f /modules | |
| parent | Initial revision (diff) | |
| download | apache2-07e51cc45d53965ddac3d8e062338e07ba474ec6.tar.xz apache2-07e51cc45d53965ddac3d8e062338e07ba474ec6.zip | |
Resolve conflicts after import.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88994 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/ssl/.cvsignore | 10 | ||||
| -rw-r--r-- | modules/ssl/.indent.pro | 54 |
2 files changed, 3 insertions, 61 deletions
diff --git a/modules/ssl/.cvsignore b/modules/ssl/.cvsignore index 65f0cc30cf..239bc29765 100644 --- a/modules/ssl/.cvsignore +++ b/modules/ssl/.cvsignore @@ -1,10 +1,6 @@ -.deps .libs -*.la -modules.mk +.deps Makefile +modules.mk *.lo -*.slo -*.so -Debug -Release +*.la diff --git a/modules/ssl/.indent.pro b/modules/ssl/.indent.pro deleted file mode 100644 index a9fbe9f9a1..0000000000 --- a/modules/ssl/.indent.pro +++ /dev/null @@ -1,54 +0,0 @@ --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 |