diff options
author | Stefan Monnier <monnier@iro.umontreal.ca> | 2011-01-14 12:18:41 -0500 |
---|---|---|
committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2011-01-14 12:18:41 -0500 |
commit | 77ab81d0545e980c57c0a35510ade29a9e43b4cd (patch) | |
tree | 258514dac7faab41642d8f319eb113c8a5f09690 /lisp/cedet/semantic/wisent | |
parent | 8faba62c38f67693535c3471d867e66757b3b04e (diff) | |
parent | fb724e553757e9d3344be443ab5f329afc9bf91c (diff) | |
download | emacs-77ab81d0545e980c57c0a35510ade29a9e43b4cd.tar.gz emacs-77ab81d0545e980c57c0a35510ade29a9e43b4cd.tar.bz2 emacs-77ab81d0545e980c57c0a35510ade29a9e43b4cd.zip |
Merge from emacs-23
Diffstat (limited to 'lisp/cedet/semantic/wisent')
-rw-r--r-- | lisp/cedet/semantic/wisent/comp.el | 3 | ||||
-rw-r--r-- | lisp/cedet/semantic/wisent/java-tags.el | 2 | ||||
-rw-r--r-- | lisp/cedet/semantic/wisent/javascript.el | 2 | ||||
-rw-r--r-- | lisp/cedet/semantic/wisent/javat-wy.el | 2 | ||||
-rw-r--r-- | lisp/cedet/semantic/wisent/js-wy.el | 2 | ||||
-rw-r--r-- | lisp/cedet/semantic/wisent/python-wy.el | 2 | ||||
-rw-r--r-- | lisp/cedet/semantic/wisent/python.el | 2 | ||||
-rw-r--r-- | lisp/cedet/semantic/wisent/wisent.el | 2 |
8 files changed, 8 insertions, 9 deletions
diff --git a/lisp/cedet/semantic/wisent/comp.el b/lisp/cedet/semantic/wisent/comp.el index 90585399b74..62b42c9a274 100644 --- a/lisp/cedet/semantic/wisent/comp.el +++ b/lisp/cedet/semantic/wisent/comp.el @@ -1,8 +1,7 @@ ;;; semantic/wisent/comp.el --- GNU Bison for Emacs - Grammar compiler ;; Copyright (C) 1984, 1986, 1989, 1992, 1995, 2000, 2001, 2002, 2003, -;; 2004, 2005, 2006, 2007, 2009, 2010 -;; Free Software Foundation, Inc. +;; 2004, 2005, 2006, 2007, 2009, 2010, 2011 Free Software Foundation, Inc. ;; Author: David Ponce <david@dponce.com> ;; Maintainer: David Ponce <david@dponce.com> diff --git a/lisp/cedet/semantic/wisent/java-tags.el b/lisp/cedet/semantic/wisent/java-tags.el index 4bdb6c74c74..b8362c3c55b 100644 --- a/lisp/cedet/semantic/wisent/java-tags.el +++ b/lisp/cedet/semantic/wisent/java-tags.el @@ -1,6 +1,6 @@ ;;; semantic/wisent/java-tags.el --- Java LALR parser for Emacs -;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2009, 2010 +;; Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2009, 2010, 2011 ;; Free Software Foundation, Inc. ;; Author: David Ponce <david@dponce.com> diff --git a/lisp/cedet/semantic/wisent/javascript.el b/lisp/cedet/semantic/wisent/javascript.el index df3bbfecaa5..6731715d12c 100644 --- a/lisp/cedet/semantic/wisent/javascript.el +++ b/lisp/cedet/semantic/wisent/javascript.el @@ -1,6 +1,6 @@ ;;; semantic/wisent/javascript.el --- javascript parser support -;; Copyright (C) 2005, 2009, 2010 Free Software Foundation, Inc. +;; Copyright (C) 2005, 2009, 2010, 2011 Free Software Foundation, Inc. ;; Author: Eric Ludlam <zappo@gnu.org> ;; Keywords: syntax diff --git a/lisp/cedet/semantic/wisent/javat-wy.el b/lisp/cedet/semantic/wisent/javat-wy.el index 0bd9b5ed2bb..258b1ac4af7 100644 --- a/lisp/cedet/semantic/wisent/javat-wy.el +++ b/lisp/cedet/semantic/wisent/javat-wy.el @@ -1,6 +1,6 @@ ;;; semantic/wisent/javat-wy.el --- Generated parser support file -;; Copyright (C) 2002, 2007, 2009, 2010 Free Software Foundation, Inc. +;; Copyright (C) 2002, 2007, 2009, 2010, 2011 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/lisp/cedet/semantic/wisent/js-wy.el b/lisp/cedet/semantic/wisent/js-wy.el index abe989ace4d..021002059f8 100644 --- a/lisp/cedet/semantic/wisent/js-wy.el +++ b/lisp/cedet/semantic/wisent/js-wy.el @@ -1,6 +1,6 @@ ;;; semantic/wisent/js-wy.el --- Generated parser support file -;; Copyright (C) 2005, 2009, 2010 Free Software Foundation, Inc. +;; Copyright (C) 2005, 2009, 2010, 2011 Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/lisp/cedet/semantic/wisent/python-wy.el b/lisp/cedet/semantic/wisent/python-wy.el index 264ebe9bb7b..32466a31cec 100644 --- a/lisp/cedet/semantic/wisent/python-wy.el +++ b/lisp/cedet/semantic/wisent/python-wy.el @@ -1,6 +1,6 @@ ;;; semantic/wisent/python-wy.el --- Generated parser support file -;; Copyright (C) 2002, 2003, 2004, 2007, 2010 +;; Copyright (C) 2002, 2003, 2004, 2007, 2010, 2011 ;; Free Software Foundation, Inc. ;; This file is part of GNU Emacs. diff --git a/lisp/cedet/semantic/wisent/python.el b/lisp/cedet/semantic/wisent/python.el index 122e1bfb353..cd952d2c305 100644 --- a/lisp/cedet/semantic/wisent/python.el +++ b/lisp/cedet/semantic/wisent/python.el @@ -1,6 +1,6 @@ ;;; wisent-python.el --- Semantic support for Python -;; Copyright (C) 2002, 2004, 2006, 2007, 2008, 2009, 2010 +;; Copyright (C) 2002, 2004, 2006, 2007, 2008, 2009, 2010, 2011 ;; Free Software Foundation, Inc. ;; Author: Richard Kim <emacs18@gmail.com> diff --git a/lisp/cedet/semantic/wisent/wisent.el b/lisp/cedet/semantic/wisent/wisent.el index c34f6ab335a..32eb638548d 100644 --- a/lisp/cedet/semantic/wisent/wisent.el +++ b/lisp/cedet/semantic/wisent/wisent.el @@ -1,6 +1,6 @@ ;;; semantic/wisent/wisent.el --- GNU Bison for Emacs - Runtime -;;; Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2009, 2010 +;;; Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2009, 2010, 2011 ;;; Free Software Foundation, Inc. ;; Author: David Ponce <david@dponce.com> |