code.delx.au - gnu-emacs-elpa/commit

]> code.delx.au - gnu-emacs-elpa/commit

delx.au / code / gnu-emacs-elpa / commit

author	Dmitry Gutov <dgutov@yandex.ru>
	Sat, 19 Apr 2014 10:11:04 +0000 (14:11 +0400)
committer	Dmitry Gutov <dgutov@yandex.ru>
	Sat, 19 Apr 2014 10:11:04 +0000 (14:11 +0400)
commit	77719a9c033ff72b9d2d6c0d857c77642b26a8b0
tree	08b65d0a65077aef7e14e3f0c2bdf35b90fcc2be	tree
parent	0c8e3a10bcdb93dcc81db045419fb87ed834914a	commit \| diff
parent	51c140ca9ee32d27cacc7b2b07d4539bf98ae575	commit \| diff

Merge commit '51c140ca9ee32d27cacc7b2b07d4539bf98ae575' from company-master

Conflicts:
packages/company/company-pysmell.el

30 files changed:

packages/company/.travis.yml	diff1 \|	diff2 \|	blob \| history
packages/company/Makefile	diff1 \|	diff2 \|	blob \| history
packages/company/NEWS.md	diff1 \|	diff2 \|	blob \| history
packages/company/company-abbrev.el	diff1 \|	diff2 \|	blob \| history
packages/company/company-bbdb.el	diff1 \|	diff2 \|	blob \| history
packages/company/company-capf.el	diff1 \|	diff2 \|	blob \| history
packages/company/company-clang.el	diff1 \|	diff2 \|	blob \| history
packages/company/company-cmake.el	diff1 \|	diff2 \|	blob \| history
packages/company/company-css.el	diff1 \|	diff2 \|	blob \| history
packages/company/company-dabbrev-code.el	diff1 \|	diff2 \|	blob \| history
packages/company/company-dabbrev.el	diff1 \|	diff2 \|	blob \| history
packages/company/company-eclim.el	diff1 \|	diff2 \|	blob \| history
packages/company/company-elisp-tests.el	\|	diff2 \|	blob \| history
packages/company/company-elisp.el	diff1 \|	diff2 \|	blob \| history
packages/company/company-etags.el	diff1 \|	diff2 \|	blob \| history
packages/company/company-files.el	diff1 \|	diff2 \|	blob \| history
packages/company/company-gtags.el	diff1 \|	diff2 \|	blob \| history
packages/company/company-ispell.el	diff1 \|	diff2 \|	blob \| history
packages/company/company-keywords.el	diff1 \|	diff2 \|	blob \| history
packages/company/company-nxml.el	diff1 \|	diff2 \|	blob \| history
packages/company/company-oddmuse.el	diff1 \|	diff2 \|	blob \| history
packages/company/company-pysmell.el	diff1 \|	diff2 \|	blob \| history
packages/company/company-ropemacs.el	diff1 \|	diff2 \|	blob \| history
packages/company/company-semantic.el	diff1 \|	diff2 \|	blob \| history
packages/company/company-template.el	diff1 \|	diff2 \|	blob \| history
packages/company/company-tempo.el	diff1 \|	diff2 \|	blob \| history
packages/company/company-tests.el	diff1 \|	diff2 \|	blob \| history
packages/company/company-xcode.el	diff1 \|	diff2 \|	blob \| history
packages/company/company-yasnippet.el	diff1 \|	diff2 \|	blob \| history
packages/company/company.el	diff1 \|	diff2 \|	blob \| history

RSS Atom

packages/company/.travis.yml	diff1 \|	diff2 \|	blob \| history
packages/company/Makefile	diff1 \|	diff2 \|	blob \| history
packages/company/NEWS.md	diff1 \|	diff2 \|	blob \| history
packages/company/company-abbrev.el	diff1 \|	diff2 \|	blob \| history
packages/company/company-bbdb.el	diff1 \|	diff2 \|	blob \| history
packages/company/company-capf.el	diff1 \|	diff2 \|	blob \| history
packages/company/company-clang.el	diff1 \|	diff2 \|	blob \| history
packages/company/company-cmake.el	diff1 \|	diff2 \|	blob \| history
packages/company/company-css.el	diff1 \|	diff2 \|	blob \| history
packages/company/company-dabbrev-code.el	diff1 \|	diff2 \|	blob \| history
packages/company/company-dabbrev.el	diff1 \|	diff2 \|	blob \| history
packages/company/company-eclim.el	diff1 \|	diff2 \|	blob \| history
packages/company/company-elisp-tests.el	\|	diff2 \|	blob \| history
packages/company/company-elisp.el	diff1 \|	diff2 \|	blob \| history
packages/company/company-etags.el	diff1 \|	diff2 \|	blob \| history
packages/company/company-files.el	diff1 \|	diff2 \|	blob \| history
packages/company/company-gtags.el	diff1 \|	diff2 \|	blob \| history
packages/company/company-ispell.el	diff1 \|	diff2 \|	blob \| history
packages/company/company-keywords.el	diff1 \|	diff2 \|	blob \| history
packages/company/company-nxml.el	diff1 \|	diff2 \|	blob \| history
packages/company/company-oddmuse.el	diff1 \|	diff2 \|	blob \| history
packages/company/company-pysmell.el	diff1 \|	diff2 \|	blob \| history
packages/company/company-ropemacs.el	diff1 \|	diff2 \|	blob \| history
packages/company/company-semantic.el	diff1 \|	diff2 \|	blob \| history
packages/company/company-template.el	diff1 \|	diff2 \|	blob \| history
packages/company/company-tempo.el	diff1 \|	diff2 \|	blob \| history
packages/company/company-tests.el	diff1 \|	diff2 \|	blob \| history
packages/company/company-xcode.el	diff1 \|	diff2 \|	blob \| history
packages/company/company-yasnippet.el	diff1 \|	diff2 \|	blob \| history
packages/company/company.el	diff1 \|	diff2 \|	blob \| history