]> code.delx.au - gnu-emacs-elpa/commitdiff
delx.au / code / gnu-emacs-elpa / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 089d51a a015fb3)
Merge commit 'a015fb350abe50d250e3e7a9c3c762397326977f' from company
authorDmitry Gutov <dgutov@yandex.ru>
Mon, 2 Feb 2015 15:22:35 +0000 (17:22 +0200)
committerDmitry Gutov <dgutov@yandex.ru>
Mon, 2 Feb 2015 15:22:35 +0000 (17:22 +0200)
1  2 
packages/company/NEWS.md patch | diff1 | diff2 | blob | history
packages/company/company-clang.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-clang.el
Simple merge
diff --cc packages/company/company.el
Simple merge