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/net/zeroconf.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/net/zeroconf.el')
| -rw-r--r-- | lisp/net/zeroconf.el | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/lisp/net/zeroconf.el b/lisp/net/zeroconf.el index 40ceb5b149f..b36330342f3 100644 --- a/lisp/net/zeroconf.el +++ b/lisp/net/zeroconf.el @@ -686,5 +686,4 @@ For the description of arguments, see `zeroconf-resolved-services-hash'." (provide 'zeroconf) -;; arch-tag: ea578165-7fa8-44f4-90f0-de3940aec69f ;;; zeroconf.el ends here |