diff options
| author | Alan Mackenzie | 2017-02-05 16:28:53 +0000 |
|---|---|---|
| committer | Alan Mackenzie | 2017-02-05 16:28:53 +0000 |
| commit | d5514332d4a6092673ce1f78fadcae0c57f7be64 (patch) | |
| tree | 1780337154904dcfad8ecfa76614b47c082160dd /lisp/progmodes/cc-align.el | |
| parent | cecc25c68f5a1834c356e18259aa2af402a70ce1 (diff) | |
| parent | de3336051ef74e0c3069374ced5b5fc7bb9fba15 (diff) | |
| download | emacs-d5514332d4a6092673ce1f78fadcae0c57f7be64.tar.gz emacs-d5514332d4a6092673ce1f78fadcae0c57f7be64.zip | |
Merge branch 'master' into comment-cache
Diffstat (limited to 'lisp/progmodes/cc-align.el')
| -rw-r--r-- | lisp/progmodes/cc-align.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/progmodes/cc-align.el b/lisp/progmodes/cc-align.el index a2077be24fc..7cb36c4396b 100644 --- a/lisp/progmodes/cc-align.el +++ b/lisp/progmodes/cc-align.el | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;;; cc-align.el --- custom indentation functions for CC Mode | 1 | ;;; cc-align.el --- custom indentation functions for CC Mode |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 1985, 1987, 1992-2016 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 1985, 1987, 1992-2017 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Authors: 2004- Alan Mackenzie | 5 | ;; Authors: 2004- Alan Mackenzie |
| 6 | ;; 1998- Martin Stjernholm | 6 | ;; 1998- Martin Stjernholm |