diff options
| author | Paul Eggert | 2011-08-02 22:05:38 -0700 |
|---|---|---|
| committer | Paul Eggert | 2011-08-02 22:05:38 -0700 |
| commit | 9a70f03d70e44db2ec9c6d2952cb8a1deae15000 (patch) | |
| tree | c0efd5c0a208640c0a883f4566df1b40caa3aaad /doc/misc/ChangeLog | |
| parent | 29c8a348c5c9f326af54a3d30f69cde98fe300bb (diff) | |
| download | emacs-9a70f03d70e44db2ec9c6d2952cb8a1deae15000.tar.gz emacs-9a70f03d70e44db2ec9c6d2952cb8a1deae15000.zip | |
Merge from trunk.
Diffstat (limited to 'doc/misc/ChangeLog')
| -rw-r--r-- | doc/misc/ChangeLog | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index 75e39104dcb..967f457f3c4 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog | |||
| @@ -1,3 +1,9 @@ | |||
| 1 | 2011-07-30 Michael Albinus <michael.albinus@gmx.de> | ||
| 2 | |||
| 3 | Sync with Tramp 2.2.2. | ||
| 4 | |||
| 5 | * trampver.texi: Update release number. | ||
| 6 | |||
| 1 | 2011-07-28 Bastien Guerry <bzg@gnu.org> | 7 | 2011-07-28 Bastien Guerry <bzg@gnu.org> |
| 2 | 8 | ||
| 3 | * org.texi (Using the mapping API): mention 'region as a possible | 9 | * org.texi (Using the mapping API): mention 'region as a possible |