]> code.delx.au - gnu-emacs-elpa/commit
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)
commitc87035c021a9be74f8420936c4c5043f417c02c2
treedd502e7de8b3b66224074c585dd66b57bcf3df31
parent324e000025e09600bb57e1b59e15461911443b5f
parent8dc8f9525714db66f659a2a51322345068764bd3
Merge commit '8dc8f9525714db66f659a2a51322345068764bd3' from company

Conflicts:
packages/company/company-capf.el
packages/company/NEWS.md
packages/company/company-capf.el
packages/company/company-tests.el
packages/company/company.el