]> git.eshelyaron.com Git - emacs.git/commitdiff
projects / emacs.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 796514a c10828b)
Merge branch 'master' into xwidget
authorJoakim Verona <joakim@verona.se>
Tue, 3 Feb 2015 00:07:36 +0000 (01:07 +0100)
committerJoakim Verona <joakim@verona.se>
Tue, 3 Feb 2015 00:07:36 +0000 (01:07 +0100)
Conflicts:
lisp/ChangeLog


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.