]> code.delx.au - gnu-emacs-elpa/commitdiff
delx.au / code / gnu-emacs-elpa / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2b96305 8b4d7da)
Merge commit '8b4d7da0d6aa1e24379fe5ace5bd2705352ea07e' from company
authorDmitry Gutov <dgutov@yandex.ru>
Wed, 15 Jan 2014 05:34:05 +0000 (07:34 +0200)
committerDmitry Gutov <dgutov@yandex.ru>
Wed, 15 Jan 2014 05:34:05 +0000 (07:34 +0200)
1  2 
packages/company/NEWS.md patch | diff1 | diff2 | blob | history
packages/company/company-capf.el patch | diff1 | diff2 | blob | history
packages/company/company.el patch | diff1 | diff2 | blob | history

diff --cc packages/company/NEWS.md
Simple merge
diff --cc packages/company/company-capf.el
Simple merge
diff --cc packages/company/company.el
Simple merge