[elpa] 02/02: Merge branch 'master' of git+ssh://git.sv.gnu.org/srv/git/emacs/elpa

2014-10-15 Thread Stefan Monnier
monnier pushed a commit to branch master
in repository elpa.

commit 79dbe65384654386166aa2c10d2ee56469aa3474
Merge: b027242 0750e13
Author: Stefan Monnier 
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(-)



[elpa] 02/02: Merge branch 'master' of git+ssh://git.sv.gnu.org/srv/git/emacs/elpa

2014-05-31 Thread Stefan Monnier
monnier pushed a commit to branch master
in repository elpa.

commit 590892e2edc0811fb977454f0839dec2a880a8e1
Merge: efaba1e 649b00a
Author: Stefan Monnier 
Date:   Sat May 31 22:04:29 2014 -0400

Merge branch 'master' of git+ssh://git.sv.gnu.org/srv/git/emacs/elpa

 GNUmakefile|2 +-
 README |4 +-
 admin/archive-contents.el  |   70 +-
 admin/forward-diffs.py |   10 +-
 packages/ada-mode/NEWS |   19 +
 packages/ada-mode/README   |4 +-
 packages/ada-mode/ada-gnat-xref.el |4 +-
 packages/ada-mode/ada-grammar-wy.el| 2671 ++--
 packages/ada-mode/ada-mode.el  |   89 +-
 packages/ada-mode/ada-mode.info|   81 +-
 packages/ada-mode/ada-wisi.el  |9 +-
 packages/ada-mode/gnat-core.el |   12 +-
 packages/ada-mode/gnat-inspect.el  |   12 +-
 packages/ada-mode/gpr-mode.el  |   11 -
 packages/ada-mode/gpr-query.el |   25 +-
 packages/ascii-art-to-unicode/HACKING  |1 +
 packages/ascii-art-to-unicode/NEWS |4 +
 .../ascii-art-to-unicode/ascii-art-to-unicode.el   |   25 +-
 packages/gnugo/NEWS|1 +
 packages/gnugo/gnugo-frolic.el |  203 +-
 packages/gnugo/gnugo-imgen.el  |   91 +-
 packages/gnugo/gnugo.el|  416 ++--
 packages/metar/metar.el|  657 +
 packages/nlinum/nlinum.el  |   13 +-
 packages/osc/osc.el|  237 ++
 packages/xpm/NEWS  |3 +
 packages/xpm/xpm.el|8 +-
 27 files changed, 2900 insertions(+), 1782 deletions(-)



[elpa] 02/02: Merge branch 'master' of git+ssh://git.sv.gnu.org/srv/git/emacs/elpa

2014-05-28 Thread Mario Lang
mlang pushed a commit to branch master
in repository elpa.

commit f9898329cc8e6cf52a2e47b39a8b54fb94652d6d
Merge: 741860f 4fb5acb
Author: Mario Lang 
Date:   Wed May 28 10:41:17 2014 +0200

Merge branch 'master' of git+ssh://git.sv.gnu.org/srv/git/emacs/elpa

 packages/gnugo/gnugo.el |2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)



[elpa] 02/02: Merge branch 'master' of git+ssh://git.sv.gnu.org/srv/git/emacs/elpa

2014-05-11 Thread Stefan Monnier
monnier pushed a commit to branch master
in repository elpa.

commit 0403ce538c34d1393ac5c0f4ea67089c21e40f7b
Merge: 96db8a5 386a3b0
Author: Stefan Monnier 
Date:   Mon May 12 02:27:50 2014 -0400

Merge branch 'master' of git+ssh://git.sv.gnu.org/srv/git/emacs/elpa

 packages/ascii-art-to-unicode/NEWS |4 ++-
 .../ascii-art-to-unicode/ascii-art-to-unicode.el   |   21 +--
 2 files changed, 21 insertions(+), 4 deletions(-)



[ELPA-diffs] [elpa] 02/02: Merge branch 'master' of git+ssh://git.sv.gnu.org/srv/git/emacs/elpa

2014-01-29 Thread Stefan Monnier
monnier pushed a commit to branch master
in repository elpa.

commit 5874753b1c44a7e4f318003040ce52ba311d25cd
Merge: fe973b1 f29c5e2
Author: Stefan Monnier 
Date:   Wed Jan 29 21:31:58 2014 -0500

Merge branch 'master' of git+ssh://git.sv.gnu.org/srv/git/emacs/elpa

 packages/README   |7 +
 packages/oauth2/oauth2.el |   62 +---
 2 files changed, 48 insertions(+), 21 deletions(-)



[ELPA-diffs] [elpa] 02/02: Merge branch 'master' of git+ssh://git.sv.gnu.org/srv/git/emacs/elpa

2014-01-28 Thread Stefan Monnier
monnier pushed a commit to branch master
in repository elpa.

commit 7dc54e928d7f8e571cc024951d49e0b222515edb
Merge: 0bae712 cb0aee3
Author: Stefan Monnier 
Date:   Tue Jan 28 07:46:22 2014 -0500

Merge branch 'master' of git+ssh://git.sv.gnu.org/srv/git/emacs/elpa

 packages/debbugs/README |4 ++--
 packages/debbugs/debbugs-gnu.el |2 +-
 packages/debbugs/debbugs-org.el |2 +-
 packages/debbugs/debbugs.el |2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)