]> code.delx.au - gnu-emacs-elpa/commitdiff
delx.au / code / gnu-emacs-elpa / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ad2c330 e085a33)
Merge commit 'e085a333867959a1b36015a3ad8e12e5bd6550d9' from company
authorDmitry Gutov <dgutov@yandex.ru>
Wed, 4 Mar 2015 17:01:20 +0000 (19:01 +0200)
committerDmitry Gutov <dgutov@yandex.ru>
Wed, 4 Mar 2015 17:01:20 +0000 (19:01 +0200)
1  2 
packages/company/company.el patch | diff1 | diff2 | blob | history
packages/company/test/async-tests.el patch | diff1 | diff2 | blob | history

diff --cc packages/company/company.el
Simple merge
diff --cc packages/company/test/async-tests.el
Simple merge