[gimp/soc-2010-cage-2: 41/50] Merge branch 'master' into soc-2010-cage-2
- From: Alexia Death <alexiade src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp/soc-2010-cage-2: 41/50] Merge branch 'master' into soc-2010-cage-2
- Date: Thu, 2 Sep 2010 19:28:32 +0000 (UTC)
commit d98bd748e7b896e85114cd9087cc53f2a276ade3
Merge: 6dc2042 e77dd90
Author: Alexia Death <alexiadeath gmail com>
Date: Wed Sep 1 11:21:58 2010 +0300
Merge branch 'master' into soc-2010-cage-2
Makefile.am | 3 +-
app/Makefile.am | 21 +-
app/core/gimpimage-convert.c | 2 +-
app/display/gimpcanvas.c | 322 --
app/display/gimpcanvas.h | 28 -
app/display/gimpdisplayshell-callbacks.c | 57 +-
app/display/gimpdisplayshell-draw.c | 68 +-
app/display/gimpdisplayshell-draw.h | 4 +-
app/display/gimpdisplayshell-render.c | 93 +-
app/display/gimpdisplayshell-render.h | 1 +
app/display/gimpdisplayshell-selection.c | 320 +-
app/display/gimpdisplayshell-style.c | 144 +-
app/display/gimpdisplayshell.c | 12 +-
app/display/gimpdisplayshell.h | 2 +-
app/pdb/gimppdb-utils.c | 83 +-
app/pdb/gimppdb-utils.h | 9 +
app/pdb/image-cmds.c | 989 +++--
app/pdb/internal-procs.c | 2 +-
app/pdb/item-cmds.c | 207 +
app/widgets/Makefile.am | 2 +
app/widgets/gimpcairo.c | 201 +
app/widgets/gimpcairo.h | 42 +
app/widgets/gimpcolormapeditor.c | 83 +-
app/widgets/gimptoolbox.c | 31 +-
build/.gitignore | 2 +
build/Makefile.am | 2 +
build/buildbot/suppressed_warnings.txt | 21 +
build/windows/.gitignore | 4 +
build/windows/Makefile.am | 8 +
{app => build/windows}/fileicon.ico | Bin 22486 -> 22486 bytes
.../windows/gimp-plug-ins.rc.in | 9 +-
{app => build/windows}/gimp.manifest | 0
{app => build/windows}/gimp.rc.in | 8 +-
build/windows/gimprc-plug-ins.rule | 6 +
build/windows/gimprc.rule | 6 +
build/windows/plug-ins.ico | Bin 0 -> 2550 bytes
{app => build/windows}/wilber.ico | Bin 45046 -> 45046 bytes
configure.ac | 36 +-
libgimp/gimp.def | 9 +
libgimp/gimpimage_pdb.c | 493 ++-
libgimp/gimpimage_pdb.h | 36 +-
libgimp/gimpitem_pdb.c | 110 +
libgimp/gimpitem_pdb.h | 4 +
libgimpcolor/test-color-parser.c | 4 +-
menus/Makefile.am | 4 +-
plug-ins/color-rotate/Makefile.am | 8 +-
plug-ins/common/.gitignore | 6 +-
plug-ins/common/Makefile.am | 474 ++-
plug-ins/common/{file-pdf.c => file-pdf-load.c} | 4 +-
plug-ins/common/file-pdf-save.c | 1477 ++++++
plug-ins/common/gimprc.common | 145 +
plug-ins/common/mkgen.pl | 23 +-
plug-ins/common/plugin-defs.pl | 3 +-
plug-ins/file-bmp/Makefile.am | 8 +-
plug-ins/file-faxg3/Makefile.am | 8 +-
plug-ins/file-fits/Makefile.am | 8 +-
plug-ins/file-fli/Makefile.am | 8 +-
plug-ins/file-ico/Makefile.am | 8 +-
plug-ins/file-jpeg/Makefile.am | 8 +-
plug-ins/file-psd/Makefile.am | 14 +
plug-ins/file-sgi/Makefile.am | 8 +-
plug-ins/file-uri/Makefile.am | 8 +-
plug-ins/file-xjt/Makefile.am | 8 +-
plug-ins/flame/Makefile.am | 8 +-
plug-ins/fractal-explorer/Makefile.am | 8 +-
plug-ins/gfig/Makefile.am | 8 +-
plug-ins/gimpressionist/Makefile.am | 8 +-
plug-ins/gradient-flare/Makefile.am | 8 +-
plug-ins/help-browser/Makefile.am | 8 +-
plug-ins/help/Makefile.am | 8 +-
plug-ins/ifs-compose/Makefile.am | 8 +-
plug-ins/imagemap/Makefile.am | 8 +-
plug-ins/lighting/Makefile.am | 8 +-
plug-ins/map-object/Makefile.am | 8 +-
plug-ins/maze/Makefile.am | 8 +-
plug-ins/metadata/Makefile.am | 8 +-
plug-ins/pagecurl/Makefile.am | 8 +-
plug-ins/print/Makefile.am | 8 +-
plug-ins/script-fu/Makefile.am | 8 +-
plug-ins/selection-to-path/Makefile.am | 8 +-
plug-ins/twain/Makefile.am | 7 +-
po-libgimp/br.po | 446 +-
po-plug-ins/POTFILES.in | 2 +-
po-plug-ins/br.po | 615 ++--
po-python/LINGUAS | 1 +
po-python/br.po | 337 ++
po-script-fu/br.po | 527 ++-
po-script-fu/it.po | 6 +-
po-tags/POTFILES.skip | 13 +
po/br.po | 2026 ++++----
po/es.po | 5342 ++++++++++++--------
tools/pdbgen/pdb/image.pdb | 328 +-
tools/pdbgen/pdb/item.pdb | 115 +
93 files changed, 9920 insertions(+), 5695 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
