projects
/
emacs.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
426dfb9
3f31613
)
Merge branch 'master' of git.ganneff.de:emacs
author
Joerg Jaspert
<joerg@debian.org>
Fri, 23 May 2014 08:32:01 +0000
(10:32 +0200)
committer
Joerg Jaspert
<joerg@debian.org>
Fri, 23 May 2014 08:32:01 +0000
(10:32 +0200)
* 'master' of git.ganneff.de:emacs:
Adjust inf-ruby part
Conflicts:
.emacs.d/config/emacs.org
Trivial merge