[Pkg-sugar-commit] [sugar-base] 08/13: Merge commit 'upstream/0.84.2' into master-0.84

[Jonas Smedegaard]

This is an automated email from the git hooks/post-receive script.

js pushed a commit to annotated tag debian/0.84.2-1
in repository sugar-base.

commit 264b84394226358c6b63bbee89148e0cd8fc571c
Merge: a2d85d4 6f914ff
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Fri Jun 25 18:40:14 2010 +0200

    Merge commit 'upstream/0.84.2' into master-0.84

 Makefile.in                    |  329 ++-
 aclocal.m4                     |  530 ++--
 compile                        |  142 --
 config.guess                   |  239 +-
 config.sub                     |   91 +-
 configure                      | 5289 ++++++++++++++++++++++------------------
 configure.ac                   |    2 +-
 depcomp                        |  172 +-
 install-sh                     |    5 +-
 ltmain.sh                      |  790 +++++-
 m4/intltool.m4                 |   64 +-
 m4/libtool.m4                  |  157 +-
 m4/ltoptions.m4                |    2 +-
 m4/ltsugar.m4                  |   20 +-
 m4/ltversion.m4                |   10 +-
 missing                        |  104 +-
 po/Makefile.in.in              |    6 +-
 py-compile                     |   36 +-
 src/Makefile.in                |  272 ++-
 src/sugar/Makefile.in          |  439 ++--
 src/sugar/dispatch/Makefile.in |  190 +-
 src/sugar/mime.py              |   10 +-
 22 files changed, 5176 insertions(+), 3723 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-sugar/sugar-base.git