diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2011-01-17 11:01:01 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-01-17 11:01:01 -0800 |
| commit | a3e44e793796153ff1534be9c74fcab50b45de30 (patch) | |
| tree | 863d5db087c8e034c96d06ea955515f4d3f3d0a3 /lisp/url/url-history.el | |
| parent | 7f818df9420a1320539f7e3e633003573a570413 (diff) | |
| parent | 721be9cd4865e9f7d68020adcfa672d2edd52b07 (diff) | |
| download | emacs-a3e44e793796153ff1534be9c74fcab50b45de30.tar.gz emacs-a3e44e793796153ff1534be9c74fcab50b45de30.tar.bz2 emacs-a3e44e793796153ff1534be9c74fcab50b45de30.zip | |
Merge from mainline.
Diffstat (limited to 'lisp/url/url-history.el')
| -rw-r--r-- | lisp/url/url-history.el | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/lisp/url/url-history.el b/lisp/url/url-history.el index 9e933332e31..c0649db57ce 100644 --- a/lisp/url/url-history.el +++ b/lisp/url/url-history.el @@ -1,7 +1,7 @@ ;;; url-history.el --- Global history tracking for URL package -;; Copyright (C) 1996, 1997, 1998, 1999, 2004, -;; 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. +;; Copyright (C) 1996, 1997, 1998, 1999, 2004, 2005, 2006, 2007, 2008, +;; 2009, 2010, 2011 Free Software Foundation, Inc. ;; Keywords: comm, data, processes, hypermedia @@ -184,5 +184,4 @@ user for what type to save as." (provide 'url-history) -;; arch-tag: fbbbaf63-db36-4e88-bc9f-2939aa93afb2 ;;; url-history.el ends here |