diff options
| author | Paul Eggert | 2013-01-02 08:13:04 -0800 |
|---|---|---|
| committer | Paul Eggert | 2013-01-02 08:13:04 -0800 |
| commit | 0877d0dc24ee792b9b14592869ea1aa0934aee58 (patch) | |
| tree | 08e9265a1dd95974dc72622a9bef194682c0c716 /m4/timer_time.m4 | |
| parent | aca3d51dfa45794fa68a2ffb6269e34fcee2ec6c (diff) | |
| parent | d8fb8cce84b923a3289b69549e30958710ac3ebb (diff) | |
| download | emacs-0877d0dc24ee792b9b14592869ea1aa0934aee58.tar.gz emacs-0877d0dc24ee792b9b14592869ea1aa0934aee58.zip | |
Merge from emacs-24; up to 2012-12-06T01:39:03Z!monnier@iro.umontreal.ca
Diffstat (limited to 'm4/timer_time.m4')
| -rw-r--r-- | m4/timer_time.m4 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/m4/timer_time.m4 b/m4/timer_time.m4 index bc84554b789..ea018f9a01e 100644 --- a/m4/timer_time.m4 +++ b/m4/timer_time.m4 | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | # timer_time.m4 serial 2 | 1 | # timer_time.m4 serial 2 |
| 2 | dnl Copyright (C) 2011-2012 Free Software Foundation, Inc. | 2 | dnl Copyright (C) 2011-2013 Free Software Foundation, Inc. |
| 3 | dnl This file is free software; the Free Software Foundation | 3 | dnl This file is free software; the Free Software Foundation |
| 4 | dnl gives unlimited permission to copy and/or distribute it, | 4 | dnl gives unlimited permission to copy and/or distribute it, |
| 5 | dnl with or without modifications, as long as this notice is preserved. | 5 | dnl with or without modifications, as long as this notice is preserved. |