[gimp/soc-2009-dynamics: 104/104] Merge commit 'origin/master' into soc-2009-dynamics



commit 155393491b6f0d1c0fcaf98691c8d0d84966c1db
Merge: da2920b... 750c11f...
Author: Alexia Death <alexiadeath gmail com>
Date:   Sat Oct 3 14:12:53 2009 +0300

    Merge commit 'origin/master' into soc-2009-dynamics

 app/actions/actions.c                       |   56 +-
 app/actions/debug-commands.c                |   20 +-
 app/actions/view-actions.c                  |   23 +-
 app/actions/view-commands.c                 |   39 +-
 app/actions/windows-commands.c              |    6 +-
 app/core/gimpbrush-transform.c              |  225 +-
 app/display/Makefile.am                     |    4 +
 app/display/display-types.h                 |    2 +
 app/display/gimpdisplay-foreach.c           |   15 +-
 app/display/gimpdisplay-handlers.c          |   55 -
 app/display/gimpdisplay.c                   |   86 +-
 app/display/gimpdisplayoptions.c            |   30 +-
 app/display/gimpdisplayoptions.h            |    6 +-
 app/display/gimpdisplayshell-appearance.c   |  310 +-
 app/display/gimpdisplayshell-appearance.h   |   12 +-
 app/display/gimpdisplayshell-callbacks.c    |   15 +-
 app/display/gimpdisplayshell-close.c        |   34 +-
 app/display/gimpdisplayshell-cursor.c       |   23 +-
 app/display/gimpdisplayshell-dnd.c          |    5 +-
 app/display/gimpdisplayshell-expose.c       |  116 +
 app/display/gimpdisplayshell-expose.h       |   34 +
 app/display/gimpdisplayshell-filter.c       |    1 +
 app/display/gimpdisplayshell-handlers.c     |   85 +-
 app/display/gimpdisplayshell-icon.c         |   20 +-
 app/display/gimpdisplayshell-progress.c     |  164 +-
 app/display/gimpdisplayshell-progress.h     |    5 +-
 app/display/gimpdisplayshell-render.c       |    2 -
 app/display/gimpdisplayshell-render.h       |    4 +
 app/display/gimpdisplayshell-scale-dialog.c |    5 +-
 app/display/gimpdisplayshell-scale.c        |   18 +-
 app/display/gimpdisplayshell-scroll.c       |    1 +
 app/display/gimpdisplayshell-selection.c    |    1 +
 app/display/gimpdisplayshell-title.c        |   24 +-
 app/display/gimpdisplayshell-title.h        |    1 -
 app/display/gimpdisplayshell.c              |  769 +--
 app/display/gimpdisplayshell.h              |   77 +-
 app/display/gimpimagewindow.c               | 1084 +++
 app/display/gimpimagewindow.h               |   80 +
 app/display/gimpstatusbar.c                 |   83 +-
 app/display/gimpstatusbar.h                 |  140 +-
 app/gui/gui-vtable.c                        |   10 +-
 app/gui/gui.c                               |   26 +-
 app/tools/gimpmeasuretool.c                 |   16 +-
 app/tools/gimptool.c                        |  104 +-
 app/tools/gimptransformtool.c               |    1 +
 app/widgets/gimpdockwindow.c                |    2 +-
 app/widgets/gimptoolbox.c                   |   12 -
 plug-ins/common/file-gbr.c                  |   19 +-
 plug-ins/script-fu/tinyscheme/scheme.c      |   11 +-
 plug-ins/script-fu/tinyscheme/scheme.h      |    1 +
 po-libgimp/ro.po                            | 1782 ++---
 po-plug-ins/ro.po                           | 8813 ++++++++++++------------
 po-python/ro.po                             |  177 +-
 po-script-fu/ro.po                          |  818 +--
 po-tips/ro.po                               |    8 +-
 po/ro.po                                    | 9880 ++++++++++-----------------
 56 files changed, 11367 insertions(+), 13993 deletions(-)
---



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]