[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] 02/02: Merge branch 'master' of git+ssh://git.sv.gnu.org/srv/git/
|
From: |
Stefan Monnier |
|
Subject: |
[elpa] 02/02: Merge branch 'master' of git+ssh://git.sv.gnu.org/srv/git/emacs/elpa |
|
Date: |
Wed, 15 Oct 2014 13:18:22 +0000 |
monnier pushed a commit to branch master
in repository elpa.
commit 79dbe65384654386166aa2c10d2ee56469aa3474
Merge: b027242 0750e13
Author: Stefan Monnier <address@hidden>
Date: Wed Oct 15 09:18:11 2014 -0400
Merge branch 'master' of git+ssh://git.sv.gnu.org/srv/git/emacs/elpa
packages/company/NEWS.md | 9 ++++
packages/company/company-bbdb.el | 11 +++--
packages/company/company-clang.el | 7 ++-
packages/company/company-dabbrev-code.el | 8 ++--
packages/company/company-dabbrev.el | 15 ++++--
packages/company/company-files.el | 51 +++++++++++++--------
packages/company/company-gtags.el | 1 +
packages/company/company-template.el | 59 +++++++++++++++++-------
packages/company/company-tests.el | 36 ++++++++++++++-
packages/company/company-yasnippet.el | 12 ++++-
packages/company/company.el | 73 ++++++++++++++++++++----------
11 files changed, 202 insertions(+), 80 deletions(-)