Merge from origin/emacs-24

[gnu-emacs] / lisp / calc / calccomp.el

diff --git a/lisp/calc/calccomp.el b/lisp/calc/calccomp.el
index 2f1c95b766828faf07e8abb4babfb266dc1e1d77..a3432c14b151bbf5a363f2a433cccf7938f63af5 100644 (file)
--- a/lisp/calc/calccomp.el
+++ b/lisp/calc/calccomp.el
@@ -1,6 +1,6 @@
 ;;; calccomp.el --- composition functions for Calc
 
-;; Copyright (C) 1990-1993, 2001-2012  Free Software Foundation, Inc.
+;; Copyright (C) 1990-1993, 2001-2015 Free Software Foundation, Inc.
 
 ;; Author: David Gillespie <daveg@synaptics.com>
 ;; Maintainer: Jay Belanger <jay.p.belanger@gmail.com>