]> code.delx.au - gnu-emacs-elpa/commitdiff
delx.au / code / gnu-emacs-elpa / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 12f55f5 e085a33)
Merge branch 'release'
authorDmitry Gutov <dgutov@yandex.ru>
Wed, 4 Mar 2015 17:04:32 +0000 (19:04 +0200)
committerDmitry Gutov <dgutov@yandex.ru>
Wed, 4 Mar 2015 17:04:32 +0000 (19:04 +0200)
Conflicts:
company.el

1  2 
company.el patch | diff1 | diff2 | blob | history

diff --cc company.el
Simple merge