[Emacs-diffs] [emacs] branch master updated (1a71302 -> bc5d86f)

[Jay Belanger]

jpb pushed a change to branch master
in repository emacs.

      from  1a71302   Resolve pull conflict
       new  1a30156   2014-11-16  Thierry Banel <address@hidden>  (tiny change)
       new  bc5d86f   Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 lisp/ChangeLog          |    6 ++++++
 lisp/calc/calc-arith.el |    4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)