[gtk+/native-layout: 4/4] Merge branch 'master' into native-layout
- From: Tristan Van Berkom <tvb src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/native-layout: 4/4] Merge branch 'master' into native-layout
- Date: Sat, 26 Jun 2010 18:07:57 +0000 (UTC)
commit ea4d2f9a522cae704b32cc8dff4e241b51f59c28
Merge: bba9e3e cc5500a
Author: Tristan Van Berkom <tristan van berkom gmail com>
Date: Sat Jun 26 13:25:40 2010 -0400
Merge branch 'master' into native-layout
INSTALL.in | 16 +-
Makefile.am | 4 +-
configure.ac | 479 +--
contrib/Makefile.am | 8 -
contrib/gdk-pixbuf-xlib/ChangeLog | 354 --
contrib/gdk-pixbuf-xlib/Makefile.am | 42 -
contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-3.0.pc.in | 11 -
contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-drawable.c | 1338 -----
contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-private.h | 30 -
contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib-render.c | 398 --
contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib.c | 63 -
contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlib.h | 87 -
contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlibrgb.c | 3724 ------------
contrib/gdk-pixbuf-xlib/gdk-pixbuf-xlibrgb.h | 188 -
demos/Makefile.am | 18 +-
demos/gtk-demo/Makefile.am | 5 +-
docs/reference/Makefile.am | 2 +-
docs/reference/gdk-pixbuf/Makefile.am | 116 -
docs/reference/gdk-pixbuf/apple-red-1a.png | Bin 29895 -> 0 bytes
docs/reference/gdk-pixbuf/apple-red-2c.png | Bin 19103 -> 0 bytes
docs/reference/gdk-pixbuf/composite.dia | Bin 2351 -> 0 bytes
docs/reference/gdk-pixbuf/composite.png | Bin 106599 -> 0 bytes
.../gdk-pixbuf/gdk-pixbuf-csource-3.0.xml | 177 -
.../gdk-pixbuf/gdk-pixbuf-from-drawables.sgml | 29 -
.../gdk-pixbuf/gdk-pixbuf-query-loaders-3.0.xml | 74 -
.../reference/gdk-pixbuf/gdk-pixbuf-rendering.sgml | 32 -
docs/reference/gdk-pixbuf/gdk-pixbuf.sgml | 192 -
docs/reference/gdk-pixbuf/gdk-pixbuf3-sections.txt | 298 -
docs/reference/gdk-pixbuf/gdk-pixbuf3.types | 8 -
docs/reference/gdk-pixbuf/gnome-gmush-1.png | Bin 23814 -> 0 bytes
docs/reference/gdk-pixbuf/porting-from-imlib.sgml | 358 --
docs/reference/gdk-pixbuf/tmpl/animation.sgml | 183 -
docs/reference/gdk-pixbuf/tmpl/creating.sgml | 129 -
docs/reference/gdk-pixbuf/tmpl/file-loading.sgml | 109 -
docs/reference/gdk-pixbuf/tmpl/file-saving.sgml | 143 -
.../gdk-pixbuf/tmpl/gdk-pixbuf-loader.sgml | 209 -
.../gdk-pixbuf/tmpl/gdk-pixbuf-unused.sgml | 585 --
.../tmpl/gdk-pixbuf-xlib-from-drawables.sgml | 54 -
.../gdk-pixbuf/tmpl/gdk-pixbuf-xlib-init.sgml | 52 -
.../gdk-pixbuf/tmpl/gdk-pixbuf-xlib-rendering.sgml | 100 -
.../gdk-pixbuf/tmpl/gdk-pixbuf-xlib-rgb.sgml | 290 -
docs/reference/gdk-pixbuf/tmpl/gdk-pixbuf.sgml | 292 -
.../gdk-pixbuf/tmpl/initialization_versions.sgml | 106 -
docs/reference/gdk-pixbuf/tmpl/inline.sgml | 137 -
.../gdk-pixbuf/tmpl/module_interface.sgml | 382 --
docs/reference/gdk-pixbuf/tmpl/refcounting.sgml | 67 -
docs/reference/gdk-pixbuf/tmpl/scaling.sgml | 246 -
docs/reference/gdk-pixbuf/tmpl/util.sgml | 87 -
docs/reference/gdk-pixbuf/version.xml.in | 1 -
docs/reference/gdk/Makefile.am | 2 +-
docs/reference/gtk/Makefile.am | 4 +-
docs/reference/gtk/building.sgml | 23 +-
docs/tools/Makefile.am | 13 +-
gdk-pixbuf/ChangeLog | 6289 --------------------
gdk-pixbuf/Makefile.am | 748 ---
gdk-pixbuf/abicheck.sh | 5 -
gdk-pixbuf/gdk-pixbuf-animation.c | 704 ---
gdk-pixbuf/gdk-pixbuf-animation.h | 146 -
gdk-pixbuf/gdk-pixbuf-core.h | 260 -
gdk-pixbuf/gdk-pixbuf-csource.1 | 91 -
gdk-pixbuf/gdk-pixbuf-csource.c | 304 -
gdk-pixbuf/gdk-pixbuf-data.c | 83 -
gdk-pixbuf/gdk-pixbuf-enum-types.c.template | 38 -
gdk-pixbuf/gdk-pixbuf-enum-types.h.template | 28 -
gdk-pixbuf/gdk-pixbuf-features.h.in | 39 -
gdk-pixbuf/gdk-pixbuf-i18n.h | 32 -
gdk-pixbuf/gdk-pixbuf-io.c | 2678 ---------
gdk-pixbuf/gdk-pixbuf-io.h | 172 -
gdk-pixbuf/gdk-pixbuf-loader.c | 789 ---
gdk-pixbuf/gdk-pixbuf-loader.h | 102 -
gdk-pixbuf/gdk-pixbuf-marshal.list | 28 -
gdk-pixbuf/gdk-pixbuf-private.h | 102 -
gdk-pixbuf/gdk-pixbuf-scale.c | 463 --
gdk-pixbuf/gdk-pixbuf-scaled-anim.c | 286 -
gdk-pixbuf/gdk-pixbuf-scaled-anim.h | 47 -
gdk-pixbuf/gdk-pixbuf-simple-anim.c | 553 --
gdk-pixbuf/gdk-pixbuf-simple-anim.h | 61 -
gdk-pixbuf/gdk-pixbuf-transform.h | 119 -
gdk-pixbuf/gdk-pixbuf-util.c | 337 --
gdk-pixbuf/gdk-pixbuf-xform.c | 104 -
gdk-pixbuf/gdk-pixbuf.c | 732 ---
gdk-pixbuf/gdk-pixbuf.h | 45 -
gdk-pixbuf/gdk-pixbuf.symbols | 202 -
gdk-pixbuf/gdk-pixdata.c | 903 ---
gdk-pixbuf/gdk-pixdata.h | 170 -
gdk-pixbuf/gdk_pixbuf.rc.in | 30 -
gdk-pixbuf/gen-color-table.pl | 74 -
gdk-pixbuf/io-ani-animation.c | 347 --
gdk-pixbuf/io-ani-animation.h | 113 -
gdk-pixbuf/io-ani.c | 720 ---
gdk-pixbuf/io-bmp.c | 1429 -----
gdk-pixbuf/io-gdip-animation.c | 383 --
gdk-pixbuf/io-gdip-animation.h | 117 -
gdk-pixbuf/io-gdip-bmp.c | 87 -
gdk-pixbuf/io-gdip-emf.c | 64 -
gdk-pixbuf/io-gdip-gif.c | 85 -
gdk-pixbuf/io-gdip-ico.c | 64 -
gdk-pixbuf/io-gdip-jpeg.c | 141 -
gdk-pixbuf/io-gdip-native.h | 264 -
gdk-pixbuf/io-gdip-png.c | 138 -
gdk-pixbuf/io-gdip-propertytags.h | 228 -
gdk-pixbuf/io-gdip-tiff.c | 87 -
gdk-pixbuf/io-gdip-utils.c | 1022 ----
gdk-pixbuf/io-gdip-utils.h | 52 -
gdk-pixbuf/io-gdip-wmf.c | 63 -
gdk-pixbuf/io-gif-animation.c | 602 --
gdk-pixbuf/io-gif-animation.h | 175 -
gdk-pixbuf/io-gif.c | 1698 ------
gdk-pixbuf/io-icns.c | 404 --
gdk-pixbuf/io-ico.c | 1254 ----
gdk-pixbuf/io-jasper.c | 313 -
gdk-pixbuf/io-jpeg.c | 1315 ----
gdk-pixbuf/io-pcx.c | 761 ---
gdk-pixbuf/io-png.c | 1117 ----
gdk-pixbuf/io-pnm.c | 1086 ----
gdk-pixbuf/io-qtif.c | 608 --
gdk-pixbuf/io-ras.c | 551 --
gdk-pixbuf/io-tga.c | 1013 ----
gdk-pixbuf/io-tiff.c | 875 ---
gdk-pixbuf/io-wbmp.c | 380 --
gdk-pixbuf/io-xbm.c | 497 --
gdk-pixbuf/io-xpm.c | 821 ---
gdk-pixbuf/make-inline-pixbuf.c | 230 -
gdk-pixbuf/makefile.msc | 197 -
gdk-pixbuf/makegdkpixbufalias.pl | 137 -
gdk-pixbuf/pixops/DETAILS | 355 --
gdk-pixbuf/pixops/Makefile.am | 34 -
gdk-pixbuf/pixops/README | 163 -
gdk-pixbuf/pixops/composite_line_22_4a4_mmx.S | 241 -
.../pixops/composite_line_color_22_4a4_mmx.S | 253 -
gdk-pixbuf/pixops/have_mmx.S | 76 -
gdk-pixbuf/pixops/makefile.msc | 65 -
gdk-pixbuf/pixops/pixbuf-transform-math.ltx | 112 -
gdk-pixbuf/pixops/pixops-internal.h | 25 -
gdk-pixbuf/pixops/pixops.c | 2560 --------
gdk-pixbuf/pixops/pixops.h | 120 -
gdk-pixbuf/pixops/scale_line_22_33_mmx.S | 206 -
gdk-pixbuf/pixops/timescale.c | 267 -
gdk-pixbuf/pltcheck.sh | 17 -
gdk-pixbuf/queryloaders.c | 361 --
gdk-pixbuf/test-gdk-pixbuf.c | 241 -
gdk-pixbuf/xpm-color-table.h | 1521 -----
gdk/Makefile.am | 29 +-
gdk/gdkdraw.c | 41 +-
gdk/gdkpixbuf-drawable.c | 31 +-
gdk/gdkpixbuf-render.c | 26 +-
gdk/quartz/gdkinputprivate.h | 1 -
gdk/x11/Makefile.am | 2 +-
gtk/Makefile.am | 18 +-
gtk/tests/Makefile.am | 2 -
gtk/theme-bits/Makefile.am | 4 +-
modules/engines/pixbuf/Makefile.am | 1 -
modules/input/Makefile.am | 4 +-
modules/other/gail/Makefile.am | 1 -
perf/Makefile.am | 2 -
po-properties/POTFILES.in | 24 -
po/POTFILES.in | 32 -
tests/Makefile.am | 15 +-
tests/pixbuf-lowmem.c | 249 -
tests/pixbuf-random.c | 170 -
tests/pixbuf-randomly-modified.c | 159 -
tests/pixbuf-read.c | 87 -
tests/pixbuf-threads.c | 118 -
163 files changed, 117 insertions(+), 54983 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
