[Pkg-sugar-commit] [sugar-toolkit] 34/118: Merge commit 'upstream/0.84.5' 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.10-1
in repository sugar-toolkit.

commit 75d1016df8cfcd13ac025d34451b46cd0a0c231f
Merge: 82c7554 626ce7f
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Sat Jul 18 15:42:21 2009 +0200

    Merge commit 'upstream/0.84.5' into master-0.84

 Makefile.in                       |   239 +-
 aclocal.m4                        |  7000 +---------
 config.guess                      |    28 +-
 config.sub                        |    37 +-
 configure                         | 25216 +++++++++++++-----------------------
 configure.ac                      |     2 +-
 ltmain.sh                         | 13224 ++++++++++---------
 m4/intltool.m4                    |    64 +-
 m4/libtool.m4                     |  7360 +++++++++++
 m4/ltoptions.m4                   |   368 +
 m4/ltsugar.m4                     |   123 +
 m4/ltversion.m4                   |    23 +
 m4/lt~obsolete.m4                 |    92 +
 po/Makefile.in.in                 |     4 +-
 po/it.po                          |    48 +-
 po/nl.po                          |    48 +-
 po/zh_TW.po                       |    48 +-
 src/Makefile.in                   |   180 +-
 src/sugar/Makefile.in             |   373 +-
 src/sugar/activity/Makefile.in    |   138 +-
 src/sugar/bundle/Makefile.in      |   138 +-
 src/sugar/bundle/contentbundle.py |    16 +-
 src/sugar/datastore/Makefile.in   |   138 +-
 src/sugar/graphics/Makefile.in    |   138 +-
 src/sugar/presence/Makefile.in    |   138 +-
 25 files changed, 25331 insertions(+), 29852 deletions(-)

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