]> code.delx.au - gnu-emacs-elpa/commitdiff
delx.au / code / gnu-emacs-elpa / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 342d5b3 fec7c0b)
Merge commit 'fec7c0b4a8651160c5d759cc6703b2c45852d5bb'
authorDmitry Gutov <dgutov@yandex.ru>
Wed, 19 Mar 2014 03:29:43 +0000 (05:29 +0200)
committerDmitry Gutov <dgutov@yandex.ru>
Wed, 19 Mar 2014 03:29:43 +0000 (05:29 +0200)
1  2 
packages/company/.travis.yml patch | diff1 | diff2 | blob | history
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/.travis.yml
Simple merge
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