aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/ChangeLog
diff options
context:
space:
mode:
authorJoakim Verona2012-12-22 23:11:11 +0100
committerJoakim Verona2012-12-22 23:11:11 +0100
commit8fefd1ba32247a2bd98d0ffc785a5c7d7e559100 (patch)
tree2122e6253a48e4a06d3db735be7a6688ce35539c /lisp/ChangeLog
parent0fc586f6d2081729bf64e09e83980cee4fdef33f (diff)
parent1ef5f225db2fa70aa02a814b1c2c473ea03f008d (diff)
downloademacs-8fefd1ba32247a2bd98d0ffc785a5c7d7e559100.tar.gz
emacs-8fefd1ba32247a2bd98d0ffc785a5c7d7e559100.zip
auto upstream
Diffstat (limited to 'lisp/ChangeLog')
-rw-r--r--lisp/ChangeLog3
1 files changed, 3 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c256c7f8179..fa5985de74d 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
12012-12-22 Michael Albinus <michael.albinus@gmx.de> 12012-12-22 Michael Albinus <michael.albinus@gmx.de>
2 2
3 * notifications.el (notifications-notify): Protect body with
4 `with-demoted-errors'.
5
3 * net/tramp-adb.el (tramp-adb-maybe-open-connection): Check 6 * net/tramp-adb.el (tramp-adb-maybe-open-connection): Check
4 properties of remote device. Restart connection, if there is a 7 properties of remote device. Restart connection, if there is a
5 change. 8 change.