diff options
| author | Paul Eggert | 2016-04-24 12:49:21 -0700 |
|---|---|---|
| committer | Paul Eggert | 2016-04-24 12:49:21 -0700 |
| commit | 8833692b29ba11c34413d6793cf6d222ccdd930b (patch) | |
| tree | 03ce8ae53e492a08b355a1f18d2ddf98a74990c2 /admin | |
| parent | 09414150731a80ba41c105ee636108d71e1b0f39 (diff) | |
| parent | 960f90d057aa3b09f6f6f287e8996a6e9444c803 (diff) | |
| download | emacs-8833692b29ba11c34413d6793cf6d222ccdd930b.tar.gz emacs-8833692b29ba11c34413d6793cf6d222ccdd930b.zip | |
Merge from origin/emacs-25
960f90d * etc/AUTHORS: Update the AUTHORS file
b21e9d4 * admin/update_autogen: Use #!/usr/bin/env bash
Diffstat (limited to 'admin')
| -rwxr-xr-x | admin/update_autogen | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/admin/update_autogen b/admin/update_autogen index 1e8aae2bd44..f27bfe0d148 100755 --- a/admin/update_autogen +++ b/admin/update_autogen | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | #!/bin/bash | 1 | #!/usr/bin/env bash |
| 2 | ### update_autogen - update some auto-generated files in the Emacs tree | 2 | ### update_autogen - update some auto-generated files in the Emacs tree |
| 3 | 3 | ||
| 4 | ## Copyright (C) 2011-2016 Free Software Foundation, Inc. | 4 | ## Copyright (C) 2011-2016 Free Software Foundation, Inc. |