]> code.delx.au - gnu-emacs-elpa/commitdiff
Merge commit '8dc8f9525714db66f659a2a51322345068764bd3' from company
authorDmitry Gutov <dgutov@yandex.ru>
Sat, 25 Jan 2014 11:34:56 +0000 (13:34 +0200)
committerDmitry Gutov <dgutov@yandex.ru>
Sat, 25 Jan 2014 11:34:56 +0000 (13:34 +0200)
Conflicts:
packages/company/company-capf.el

1  2 
packages/company/NEWS.md
packages/company/company-capf.el
packages/company/company-tests.el
packages/company/company.el

Simple merge
Simple merge
Simple merge
Simple merge