diff options
| author | Paul Eggert | 2011-01-17 11:01:01 -0800 |
|---|---|---|
| committer | Paul Eggert | 2011-01-17 11:01:01 -0800 |
| commit | a3e44e793796153ff1534be9c74fcab50b45de30 (patch) | |
| tree | 863d5db087c8e034c96d06ea955515f4d3f3d0a3 /src/ChangeLog.2 | |
| parent | 7f818df9420a1320539f7e3e633003573a570413 (diff) | |
| parent | 721be9cd4865e9f7d68020adcfa672d2edd52b07 (diff) | |
| download | emacs-a3e44e793796153ff1534be9c74fcab50b45de30.tar.gz emacs-a3e44e793796153ff1534be9c74fcab50b45de30.zip | |
Merge from mainline.
Diffstat (limited to 'src/ChangeLog.2')
| -rw-r--r-- | src/ChangeLog.2 | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/ChangeLog.2 b/src/ChangeLog.2 index ace0a064a81..94d166f0c54 100644 --- a/src/ChangeLog.2 +++ b/src/ChangeLog.2 | |||
| @@ -4789,4 +4789,3 @@ See ChangeLog.1 for earlier changes. | |||
| 4789 | You should have received a copy of the GNU General Public License | 4789 | You should have received a copy of the GNU General Public License |
| 4790 | along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. | 4790 | along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. |
| 4791 | 4791 | ||
| 4792 | ;;; arch-tag: 3334fc8a-ec24-4601-99fc-4c8adc2b31bb | ||