dgutov pushed a commit to branch master
in repository elpa.
commit 7d682e9777bb38860a5f73e380ae033b93ed44d9
Merge: 6265448 67ab56a
Author: Dmitry Gutov <[email protected]>
Date: Mon Feb 3 19:35:24 2014 +0200
Merge commit '67ab56a5469f16652e73667ec3b4f76ff6befee6' from company
packages/company/NEWS.md | 11 ++
packages/company/company-capf.el | 10 +-
packages/company/company-clang.el | 45 ++++--
packages/company/company-dabbrev-code.el | 14 ++-
packages/company/company-dabbrev.el | 16 ++-
packages/company/company-eclim.el | 33 ++--
packages/company/company-etags.el | 6 +-
packages/company/company-template.el | 1 +
packages/company/company-tests.el | 33 ++++-
packages/company/company.el | 268 +++++++++++++++++++++---------
10 files changed, 312 insertions(+), 125 deletions(-)
