Merge from mainline.

[gnu-emacs] / etc / MORE.STUFF

diff --git a/etc/MORE.STUFF b/etc/MORE.STUFF
index 3af82a1b51a495428cf04852f92d5bb364217f1f..d876b6df504bbcfbefa08130ce8514981c595e90 100644 (file)
--- a/etc/MORE.STUFF
+++ b/etc/MORE.STUFF
@@ -1,7 +1,6 @@
 More Neat Stuff for your Emacs
 
-Copyright (C) 1993, 1999, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
-  2009, 2010  Free Software Foundation, Inc.
+Copyright (C) 1993, 1999, 2001-2011  Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
 This file describes GNU Emacs programs and resources that are
@@ -130,10 +129,6 @@ Several are for Debian GNU/Linux in particular.
 
  * Boxquote: <URL:http://www.davep.org/emacs/>
 
- * CEDET: Collection of Emacs Development Environment Tools, including
-   EIEIO, Semantic, Speedbar, EDE, and COGRE:
-   <URL:http://cedet.sourceforge.net/>
-
  * CJK-emacs: Converting MULE-encoded text to TeX:
    <URL:ftp://ctan.tug.org/tex-archive/language/chinese/CJK/> and
    mirrors of the `CTAN' TeX archives.
@@ -219,6 +214,10 @@ Several are for Debian GNU/Linux in particular.
  * Quack: <URL:http://www.neilvandyke.org/quack/>
    Quack enhances Emacs support for Scheme.
 
+ * QWE: <URL:http://www.nongnu.org/qwe/>
+   QWE's not WEB for Emacs is a quasi-WYSIWYG literate programming system for
+   Emacs that can be used with almost every programming language.
+
  * Session: <URL:http://emacs-session.sourceforge.net/>
    Session Management for Emacs.
 
@@ -277,4 +276,3 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
-arch-tag: c1d4e7c8-db85-44e6-909e-659e2b20fefa