diff options
| author | Joakim Verona | 2012-12-14 16:32:39 +0100 |
|---|---|---|
| committer | Joakim Verona | 2012-12-14 16:32:39 +0100 |
| commit | 67eb4ae399b4a26d04bceacfccf9f467145483cc (patch) | |
| tree | 6a4eb8324958db1435c78c2da095a54f577cdc25 /lisp/ChangeLog | |
| parent | 26854f044c7d553ad5c940c3a741eab508e18045 (diff) | |
| parent | 665e5e07a99173d6b310bb7234a3bd0d774d107d (diff) | |
| download | emacs-67eb4ae399b4a26d04bceacfccf9f467145483cc.tar.gz emacs-67eb4ae399b4a26d04bceacfccf9f467145483cc.zip | |
auto upstream
Diffstat (limited to 'lisp/ChangeLog')
| -rw-r--r-- | lisp/ChangeLog | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 97b3a6608ad..61ccbead17d 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,10 @@ | |||
| 1 | 2012-12-14 Dave Abrahams <dave@boostpro.com> | ||
| 2 | |||
| 3 | * vc/ediff-util.el (ediff-buffer-type): New function. | ||
| 4 | (ediff-clone-buffer-for-current-diff-comparison): Compute the buf-type | ||
| 5 | rather than taking it as as argument. | ||
| 6 | (ediff-inferior-compare-regions): Adjust calls accordingly (bug#11319). | ||
| 7 | |||
| 1 | 2012-12-14 Ryan Crum <ryan.crum@eleostech.com> | 8 | 2012-12-14 Ryan Crum <ryan.crum@eleostech.com> |
| 2 | 9 | ||
| 3 | * json.el: Add pretty-print option (bug#12634). | 10 | * json.el: Add pretty-print option (bug#12634). |