branch: externals/swiper
commit f7be72f325161c24f29bd45e9f083fbe36d67044
Merge: 20c786f754 6227843101
Author: Basil L. Contovounesios <ba...@contovou.net>
Commit: Basil L. Contovounesios <ba...@contovou.net>

    Merge branch 'master' into externals/swiper
---
 .mailmap  | 1 +
 swiper.el | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.mailmap b/.mailmap
index fa38b3f201..eb78d6ffb0 100644
--- a/.mailmap
+++ b/.mailmap
@@ -19,6 +19,7 @@
 <ricouillet...@gmail.com> <eric.da...@u-cergy.fr>
 <syo...@gmail.com> <shohei.yosh...@dena.com>
 <ywwr...@gmail.com> <58066925+ywwr...@users.noreply.github.com>
+Christopher Floess <chris.flo...@mailbox.org>
 Daanturo <daant...@gmail.com> <dantle....@gmail.com>
 Diego A. Mundo <diegoamu...@gmail.com>
 Earl Hyatt <oka...@protonmail.com> <ej...@protonmail.com>
diff --git a/swiper.el b/swiper.el
index b450789037..d4d369454d 100644
--- a/swiper.el
+++ b/swiper.el
@@ -1,6 +1,6 @@
 ;;; swiper.el --- Isearch with an overview.  Oh, man! -*- lexical-binding: t 
-*-
 
-;; Copyright (C) 2015-2024 Free Software Foundation, Inc.
+;; Copyright (C) 2015-2025 Free Software Foundation, Inc.
 
 ;; Author: Oleh Krehel <ohwoeo...@gmail.com>
 ;; Maintainer: Basil L. Contovounesios <ba...@contovou.net>

Reply via email to