]> code.delx.au - gnu-emacs-elpa/commitdiff
delx.au / code / gnu-emacs-elpa / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ce70044 d3fcbef)
Merge commit 'd3fcbefcf56d2caad172e22f24de95397c635bf2' from company
authorDmitry Gutov <dgutov@yandex.ru>
Tue, 28 Oct 2014 01:37:48 +0000 (08:37 +0700)
committerDmitry Gutov <dgutov@yandex.ru>
Tue, 28 Oct 2014 01:37:48 +0000 (08:37 +0700)
1  2 
packages/company/company-template.el patch | diff1 | diff2 | blob | history
packages/company/company.el patch | diff1 | diff2 | blob | history

diff --cc packages/company/company-template.el
Simple merge
diff --cc packages/company/company.el
Simple merge