]> git.eshelyaron.com Git - emacs.git/commitdiff
projects / emacs.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 028e24c 7932d06)
Merge branch 'master' into xwidget_mvp
authorJoakim Verona <joakim@verona.se>
Wed, 18 Feb 2015 22:01:19 +0000 (23:01 +0100)
committerJoakim Verona <joakim@verona.se>
Wed, 18 Feb 2015 22:01:19 +0000 (23:01 +0100)
1  2 
src/emacs.c patch | diff1 | diff2 | blob | history

diff --cc src/emacs.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.