diff options
| author | Glenn Morris <rgm@gnu.org> | 2012-01-18 23:21:25 -0800 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2012-01-18 23:21:25 -0800 |
| commit | f53ca86ccf69a697d5c82ee7a4e74ee8594e1eb8 (patch) | |
| tree | 2c8778e20c394e526036466bea1722c874433a33 /lisp/cedet | |
| parent | 6872312d239e1c58b0d1997006ffa4f6a42b3964 (diff) | |
| parent | 9b359fac5784bddeddd4fed318f1033921e195bd (diff) | |
| download | emacs-f53ca86ccf69a697d5c82ee7a4e74ee8594e1eb8.tar.gz | |
Merge from emacs-23; up to r100655.
Diffstat (limited to 'lisp/cedet')
| -rw-r--r-- | lisp/cedet/semantic/wisent/js-wy.el | 2 | ||||
| -rw-r--r-- | lisp/cedet/semantic/wisent/python-wy.el | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/lisp/cedet/semantic/wisent/js-wy.el b/lisp/cedet/semantic/wisent/js-wy.el index b8d3240aef1..05346b02c8d 100644 --- a/lisp/cedet/semantic/wisent/js-wy.el +++ b/lisp/cedet/semantic/wisent/js-wy.el @@ -1,7 +1,7 @@ ;;; semantic/wisent/js-wy.el --- Generated parser support file ;; Copyright (C) 2005, 2009-2012 Free Software Foundation, Inc. -;; Copyright (C) 1998-2011 Ecma International +;; Copyright (C) 1998-2011 Ecma International. ;; 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 cb0f37c8f16..e8229dcd9ea 100644 --- a/lisp/cedet/semantic/wisent/python-wy.el +++ b/lisp/cedet/semantic/wisent/python-wy.el @@ -1,7 +1,8 @@ ;;; semantic/wisent/python-wy.el --- Generated parser support file ;; Copyright (C) 2002-2004, 2007, 2010-2012 Free Software Foundation, Inc. -;; Copyright (C) 2001-2010 Python Software Foundation +;; Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, +;; 2009, 2010 Python Software Foundation; All Rights Reserved ;; This file is part of GNU Emacs. |