diff options
| author | Eli Zaretskii | 2013-03-28 20:13:59 +0200 |
|---|---|---|
| committer | Eli Zaretskii | 2013-03-28 20:13:59 +0200 |
| commit | d76bf86f438d4f5f9fe493ab76f02ffc78f3ae2e (patch) | |
| tree | 04fa8bc7bd2058a316a7ee30f8741d25bfd0b060 /test/cedet/srecode-tests.el | |
| parent | 2ef26ceb192c7683754cf0b4aa3087f501254332 (diff) | |
| parent | e74aeda863cd6896e06e92586f87b45d63d67d15 (diff) | |
| download | emacs-d76bf86f438d4f5f9fe493ab76f02ffc78f3ae2e.tar.gz emacs-d76bf86f438d4f5f9fe493ab76f02ffc78f3ae2e.zip | |
Merge from trunk and resolve conflicts.
Diffstat (limited to 'test/cedet/srecode-tests.el')
| -rw-r--r-- | test/cedet/srecode-tests.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/cedet/srecode-tests.el b/test/cedet/srecode-tests.el index d0239f627b3..7ab301898c1 100644 --- a/test/cedet/srecode-tests.el +++ b/test/cedet/srecode-tests.el | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;;; srecode-tests.el --- Some tests for CEDET's srecode | 1 | ;;; srecode-tests.el --- Some tests for CEDET's srecode |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 2008-2012 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 2008-2013 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Author: Eric M. Ludlam <eric@siege-engine.com> | 5 | ;; Author: Eric M. Ludlam <eric@siege-engine.com> |
| 6 | 6 | ||