[Pkg-sugar-commit] [sugar-toolkit] 07/12: Merge commit 'upstream/0.84.13' 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.13-1
in repository sugar-toolkit.

commit cf3621b792e22f3dc8432a82cc329037f52f7e3d
Merge: 0a8c430 4413237
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Tue Oct 12 13:08:26 2010 +0200

    Merge commit 'upstream/0.84.13' into master-0.84

 Makefile.in                     |    1 -
 aclocal.m4                      |   17 +-
 config.guess                    |  196 +-
 config.sub                      |   43 +-
 configure                       | 6028 +++++++++++++++++++++++++--------------
 configure.ac                    |    2 +-
 m4/intltool.m4                  |    2 +-
 po/pt_BR.po                     |   30 +-
 src/Makefile.in                 |    1 -
 src/sugar/Makefile.in           |    1 -
 src/sugar/_sugarext.c           |   32 +-
 src/sugar/activity/Makefile.in  |    1 -
 src/sugar/activity/activity.py  |    9 +-
 src/sugar/bundle/Makefile.in    |    1 -
 src/sugar/datastore/Makefile.in |    1 -
 src/sugar/graphics/Makefile.in  |    1 -
 src/sugar/presence/Makefile.in  |    1 -
 src/sugar/util.py               |   15 +-
 18 files changed, 4102 insertions(+), 2280 deletions(-)

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