emacs-diffs
[Top][All Lists]
Advanced
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] master f9fabb2 2/2: Merge branch 'master' of git.sv.gnu.or

From: Michael Albinus
Subject: [Emacs-diffs] master f9fabb2 2/2: Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
Date: Wed, 27 May 2015 16:50:13 +0000 
branch: master
commit f9fabb2bb099d944cc97a87933b86b9eae02d067
Merge: 570edf2 b0f3a49
Author: Michael Albinus <address@hidden>
Commit: Michael Albinus <address@hidden>

    Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
    
    Conflicts:
        lisp/net/tramp.el
reply via email to
[Prev in Thread] Current Thread [Next in Thread]