mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-15 10:30:25 -08:00
Code Issues Projects Releases Wiki Activity

Resolve CVS conflicts

Browse source
This commit is contained in:
Miles Bader 2004-04-04 04:44:10 +00:00
parent 1051f1d82c
commit e5566bd545
31 changed files with 137 additions and 79 deletions
Download patch file Download diff file Expand all files Collapse all files

8
lisp/url/url-proxy.el
View file

@ -1,7 +1,7 @@
;;; url-proxy.el --- Proxy server support
;; Author: $Author: fx $
;; Created: $Date: 2001/10/11 21:09:35 $
;; Version: $Revision: 1.5 $
;; Author: $Author: monnier $
;; Created: $Date: 2004/04/04 01:21:46 $
;; Version: $Revision: 1.1.1.1 $
;; Keywords: comm, data, processes, hypermedia
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@ -76,3 +76,5 @@
(url-http url-using-proxy callback cbargs)))
(provide 'url-proxy)
;;; arch-tag: 4ff8882e-e498-42b7-abc5-acb449cdbc62