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

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

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

summary | shortlog | log | commit | commitdiff | tree
(merge: 9b6551e 7c14ded)

author	Dmitry Gutov <dgutov@yandex.ru>
	Tue, 1 Jul 2014 11:52:40 +0000 (14:52 +0300)
committer	Dmitry Gutov <dgutov@yandex.ru>
	Tue, 1 Jul 2014 11:52:40 +0000 (14:52 +0300)
commit	c828ee6d19b57256e1fa2321dc830fe5a6cf8af1
tree	7717fe48ba4e15c1e42d7ff14f48a2ae9ac3f59d	tree
parent	9b6551e1e71ffa00f4b4d4e78d2efcbd3d9204fd	commit \| diff
parent	7c14dedc79bf0c6eaad5bf50b80ea80dd721afdc	commit \| diff

Merge commit '7c14dedc79bf0c6eaad5bf50b80ea80dd721afdc' from company

Conflicts:
packages/company/company-pysmell.el

18 files changed:

packages/company/NEWS.md	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-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-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-keywords.el	diff1 \|	diff2 \|	blob \| history
packages/company/company-pysmell.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-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