master updated (c1772ce -> 0a22747)

[Stefan Kangas]

skangas pushed a change to branch master.

      from  c1772ce   Declare some <package>-version variables obsolete
       new  271f9a6   Remove obsolete XEmacs comment
       new  0a22747   Remove more XEmacs compat code from ediff*.el


Summary of changes:
 lisp/emacs-lisp/edebug.el |  1 -
 lisp/vc/ediff-init.el     | 22 ++++------------------
 lisp/vc/ediff-util.el     |  7 ++-----
 lisp/vc/ediff-wind.el     | 21 +++++++++------------
 4 files changed, 15 insertions(+), 36 deletions(-)