From: Glenn Morris <rgm@gnu.org>
Date: Mon, 20 Feb 2012 20:22:35 +0000 (-0800)
Subject: * ack.texi (Acknowledgments): Org and Prolog updates.
X-Git-Tag: emacs-pretest-24.0.94~92
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=048df7b38a239b653d1635ac95ba080a66282e8b;p=emacs.git

* ack.texi (Acknowledgments): Org and Prolog updates.
---

diff --git a/doc/emacs/ack.texi b/doc/emacs/ack.texi
index c6ef74e6f3f..7aaf4f5cc4d 100644
--- a/doc/emacs/ack.texi
+++ b/doc/emacs/ack.texi
@@ -1,6 +1,6 @@
 @c -*- coding: iso-latin-1 -*-
 @c This is part of the Emacs manual.
-@c Copyright (C) 1994-1997, 1999-2012  Free Software Foundation, Inc.
+@c Copyright (C) 1994-1997, 1999-2012 Free Software Foundation, Inc.
 @c See file emacs.texi for copying conditions.
 @c
 @node Acknowledgments, Screen, Concept Index, Top
@@ -67,6 +67,9 @@ in the buffer.
 Joe Arceneaux wrote the original text property implementation, and
 implemented support for X11.
 
+@item
+Emil Åström, Milan Zamaza, and Stefan Bruda wrote @file{prolog.el}.
+
 @item
 Miles Bader wrote @file{image-file.el}, support code for visiting image
 files; @file{minibuf-eldef.el}, a minor mode that hides the minibuffer
@@ -267,10 +270,10 @@ Carsten Dominik wrote Ref@TeX{}, a package for setting up labels and
 cross-references in La@TeX{} documents; and co-wrote IDLWAVE mode
 (q.v.@:).  He was the original author of Org mode, for maintaining notes,
 todo lists, and project planning.  Bastien Guerry subsequently took
-over maintainership.  Thomas Baumann, Jan Böcker, Lennart
-Borgman, Baoqiu Cui, Daniel German, Tassilo Horn, Philip
-Jackson, Tokuya Kameshima, Ross Patterson, Sebastian Rose, Eric Schulte,
-Paul Sexton, Ulf Stegemann, Andy Stewart, David O'Toole, John Wiegley,
+over maintainership.  Benjamin Andresen, Thomas Baumann, Joel Boehland, Jan Böcker, Lennart
+Borgman, Baoqiu Cui, Dan Davison, Christian Egli, Eric S.@: Fraga, Daniel German, Chris Gray, Konrad Hinsen, Tassilo Horn, Philip
+Jackson, Martyn Jago, Thorsten Jolitz, Jambunathan K, Tokuya Kameshima, Sergey Litvinov, David Maus, Ross Patterson, Juan Pechiar, Sebastian Rose, Eric Schulte,
+Paul Sexton, Ulf Stegemann, Andy Stewart, Christopher Suckling, David O'Toole, John Wiegley, Zhang Weize,
 Piotr Zielinski, and others also wrote various Org mode components.
 For more information, @pxref{History and Acknowledgments,,, org, The Org Manual}.