[clutter/msvc-support: 62/62] Merge branch 'master' into msvc-support
- From: Chun-wei Fan <fanchunwei src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [clutter/msvc-support: 62/62] Merge branch 'master' into msvc-support
- Date: Fri, 13 May 2011 04:07:37 +0000 (UTC)
commit f6c055c0b1f8b6bb2b46957c03d8d0fe282ad65f
Merge: cf1315c 05a7419
Author: Chun-wei Fan <fanchunwei src gnome org>
Date: Fri May 13 12:20:24 2011 +0800
Merge branch 'master' into msvc-support
.gitignore | 32 -
README.in | 39 +-
README.md | 7 +-
clutter/Makefile.am | 116 +-
clutter/clutter-actor-private.h | 2 +
clutter/clutter-actor.c | 50 +-
clutter/clutter-actor.h | 5 +
clutter/clutter-cairo-texture.c | 13 +-
clutter/clutter-cairo-texture.h | 20 +
clutter/clutter-main.c | 21 +-
clutter/clutter-private.h | 13 +-
clutter/clutter-script.c | 4 -
clutter/clutter-stage-private.h | 7 +
clutter/clutter-stage.c | 109 +-
clutter/cogl/Makefile.am | 7 -
clutter/cogl/autogen.sh | 73 -
clutter/cogl/build/autotools/Makefile.am.enums | 51 -
clutter/cogl/build/autotools/Makefile.am.silent | 19 -
clutter/cogl/build/autotools/as-compiler-flag.m4 | 62 -
clutter/cogl/build/autotools/as-linguas.m4 | 24 -
clutter/cogl/build/autotools/introspection.m4 | 94 -
clutter/cogl/cogl/Makefile.am | 433 --
clutter/cogl/cogl/cogl-1.0-clutter.pc.in | 17 -
clutter/cogl/cogl/cogl-1.0.pc.in | 13 -
clutter/cogl/cogl/cogl-atlas-texture-private.h | 66 -
clutter/cogl/cogl/cogl-atlas-texture.c | 749 ---
clutter/cogl/cogl/cogl-atlas.c | 589 --
clutter/cogl/cogl/cogl-atlas.h | 97 -
clutter/cogl/cogl/cogl-attribute-private.h | 103 -
clutter/cogl/cogl/cogl-attribute.c | 1280 ----
clutter/cogl/cogl/cogl-attribute.h | 182 -
clutter/cogl/cogl/cogl-bitmap-fallback.c | 582 --
clutter/cogl/cogl/cogl-bitmap-pixbuf.c | 331 -
clutter/cogl/cogl/cogl-bitmap-private.h | 213 -
clutter/cogl/cogl/cogl-bitmap.c | 498 --
clutter/cogl/cogl/cogl-bitmap.h | 131 -
clutter/cogl/cogl/cogl-bitmask.c | 257 -
clutter/cogl/cogl/cogl-bitmask.h | 227 -
clutter/cogl/cogl/cogl-blend-string.c | 984 ---
clutter/cogl/cogl/cogl-blend-string.h | 137 -
clutter/cogl/cogl/cogl-blit.c | 395 --
clutter/cogl/cogl/cogl-blit.h | 89 -
clutter/cogl/cogl/cogl-buffer-private.h | 163 -
clutter/cogl/cogl/cogl-buffer.c | 556 --
clutter/cogl/cogl/cogl-buffer.h | 242 -
clutter/cogl/cogl/cogl-clip-stack.c | 748 ---
clutter/cogl/cogl/cogl-clip-stack.h | 192 -
clutter/cogl/cogl/cogl-clip-state-private.h | 53 -
clutter/cogl/cogl/cogl-clip-state.c | 255 -
clutter/cogl/cogl/cogl-clip-state.h | 50 -
clutter/cogl/cogl/cogl-clutter.c | 73 -
clutter/cogl/cogl/cogl-clutter.h | 57 -
clutter/cogl/cogl/cogl-color-private.h | 45 -
clutter/cogl/cogl/cogl-color.c | 313 -
clutter/cogl/cogl/cogl-color.h | 544 --
clutter/cogl/cogl/cogl-context-private.h | 278 -
clutter/cogl/cogl/cogl-context.c | 477 --
clutter/cogl/cogl/cogl-context.h | 67 -
clutter/cogl/cogl/cogl-debug-options.h | 181 -
clutter/cogl/cogl/cogl-debug.c | 247 -
clutter/cogl/cogl/cogl-debug.h | 120 -
clutter/cogl/cogl/cogl-defines.h.in | 36 -
clutter/cogl/cogl/cogl-deprecated.h | 36 -
clutter/cogl/cogl/cogl-display-glx-private.h | 57 -
clutter/cogl/cogl/cogl-display-private.h | 43 -
clutter/cogl/cogl/cogl-display-xlib-private.h | 35 -
clutter/cogl/cogl/cogl-display.c | 111 -
clutter/cogl/cogl/cogl-display.h | 88 -
clutter/cogl/cogl/cogl-enum-types.c.in | 41 -
clutter/cogl/cogl/cogl-enum-types.h.in | 25 -
clutter/cogl/cogl/cogl-feature-private.c | 144 -
clutter/cogl/cogl/cogl-feature-private.h | 81 -
clutter/cogl/cogl/cogl-fixed.c | 950 ---
clutter/cogl/cogl/cogl-fixed.h | 804 ---
clutter/cogl/cogl/cogl-flags.h | 89 -
clutter/cogl/cogl/cogl-framebuffer-private.h | 356 -
clutter/cogl/cogl/cogl-framebuffer.c | 1657 -----
clutter/cogl/cogl/cogl-framebuffer.h | 117 -
clutter/cogl/cogl/cogl-gtype-private.h | 48 -
clutter/cogl/cogl/cogl-handle.h | 35 -
clutter/cogl/cogl/cogl-index-array-private.h | 39 -
clutter/cogl/cogl/cogl-index-array.c | 131 -
clutter/cogl/cogl/cogl-index-array.h | 79 -
clutter/cogl/cogl/cogl-indices-private.h | 54 -
clutter/cogl/cogl/cogl-indices.c | 253 -
clutter/cogl/cogl/cogl-indices.h | 77 -
clutter/cogl/cogl/cogl-internal.h | 135 -
clutter/cogl/cogl/cogl-journal-private.h | 93 -
clutter/cogl/cogl/cogl-journal.c | 1805 ------
clutter/cogl/cogl/cogl-material-compat.c | 495 --
clutter/cogl/cogl/cogl-material-compat.h | 1397 ----
clutter/cogl/cogl/cogl-matrix-mesa.c | 1700 -----
clutter/cogl/cogl/cogl-matrix-mesa.h | 226 -
clutter/cogl/cogl/cogl-matrix-private.h | 47 -
clutter/cogl/cogl/cogl-matrix-stack.c | 550 --
clutter/cogl/cogl/cogl-matrix-stack.h | 130 -
clutter/cogl/cogl/cogl-matrix.c | 673 --
clutter/cogl/cogl/cogl-matrix.h | 589 --
clutter/cogl/cogl/cogl-object-private.h | 276 -
clutter/cogl/cogl/cogl-object.c | 249 -
clutter/cogl/cogl/cogl-object.h | 127 -
clutter/cogl/cogl/cogl-offscreen.h | 105 -
clutter/cogl/cogl/cogl-onscreen-template-private.h | 37 -
clutter/cogl/cogl/cogl-onscreen-template.c | 62 -
clutter/cogl/cogl/cogl-onscreen-template.h | 48 -
clutter/cogl/cogl/cogl-path-private.h | 115 -
clutter/cogl/cogl/cogl-path.c | 303 -
clutter/cogl/cogl/cogl-path.h | 491 --
.../cogl/cogl-pipeline-fragend-arbfp-private.h | 43 -
clutter/cogl/cogl/cogl-pipeline-fragend-arbfp.c | 1109 ----
.../cogl/cogl-pipeline-fragend-fixed-private.h | 36 -
clutter/cogl/cogl/cogl-pipeline-fragend-fixed.c | 366 --
.../cogl/cogl/cogl-pipeline-fragend-glsl-private.h | 39 -
clutter/cogl/cogl/cogl-pipeline-fragend-glsl.c | 899 ---
clutter/cogl/cogl/cogl-pipeline-opengl-private.h | 155 -
clutter/cogl/cogl/cogl-pipeline-opengl.c | 1332 ----
clutter/cogl/cogl/cogl-pipeline-private.h | 1258 ----
.../cogl/cogl/cogl-pipeline-progend-glsl-private.h | 54 -
clutter/cogl/cogl/cogl-pipeline-progend-glsl.c | 949 ---
.../cogl/cogl-pipeline-vertend-fixed-private.h | 36 -
clutter/cogl/cogl/cogl-pipeline-vertend-fixed.c | 125 -
.../cogl/cogl/cogl-pipeline-vertend-glsl-private.h | 39 -
clutter/cogl/cogl/cogl-pipeline-vertend-glsl.c | 420 --
clutter/cogl/cogl/cogl-pipeline.c | 6831 --------------------
clutter/cogl/cogl/cogl-pipeline.h | 1256 ----
clutter/cogl/cogl/cogl-pixel-array-private.h | 55 -
clutter/cogl/cogl/cogl-pixel-array.c | 148 -
clutter/cogl/cogl/cogl-pixel-array.h | 131 -
clutter/cogl/cogl/cogl-point-in-poly-private.h | 40 -
clutter/cogl/cogl/cogl-point-in-poly.c | 100 -
clutter/cogl/cogl/cogl-primitive-private.h | 54 -
clutter/cogl/cogl/cogl-primitive.c | 553 --
clutter/cogl/cogl/cogl-primitive.h | 674 --
clutter/cogl/cogl/cogl-primitives-private.h | 43 -
clutter/cogl/cogl/cogl-primitives.c | 1178 ----
clutter/cogl/cogl/cogl-primitives.h | 190 -
clutter/cogl/cogl/cogl-private.h | 53 -
clutter/cogl/cogl/cogl-profile.c | 78 -
clutter/cogl/cogl/cogl-profile.h | 61 -
clutter/cogl/cogl/cogl-program-private.h | 84 -
clutter/cogl/cogl/cogl-program.c | 633 --
clutter/cogl/cogl/cogl-rectangle-map.c | 752 ---
clutter/cogl/cogl/cogl-rectangle-map.h | 78 -
clutter/cogl/cogl/cogl-renderer-glx-private.h | 61 -
clutter/cogl/cogl/cogl-renderer-private.h | 45 -
clutter/cogl/cogl/cogl-renderer-x11-private.h | 32 -
clutter/cogl/cogl/cogl-renderer-xlib-private.h | 76 -
clutter/cogl/cogl/cogl-renderer-xlib.c | 200 -
clutter/cogl/cogl/cogl-renderer.c | 211 -
clutter/cogl/cogl/cogl-renderer.h | 164 -
clutter/cogl/cogl/cogl-shader-boilerplate.h | 127 -
clutter/cogl/cogl/cogl-shader-private.h | 65 -
clutter/cogl/cogl/cogl-shader.c | 534 --
clutter/cogl/cogl/cogl-shader.h | 453 --
clutter/cogl/cogl/cogl-spans.c | 132 -
clutter/cogl/cogl/cogl-spans.h | 70 -
clutter/cogl/cogl/cogl-sub-texture-private.h | 70 -
clutter/cogl/cogl/cogl-sub-texture.c | 473 --
clutter/cogl/cogl/cogl-swap-chain-private.h | 37 -
clutter/cogl/cogl/cogl-swap-chain.c | 66 -
clutter/cogl/cogl/cogl-swap-chain.h | 46 -
clutter/cogl/cogl/cogl-texture-2d-private.h | 115 -
clutter/cogl/cogl/cogl-texture-2d-sliced-private.h | 71 -
clutter/cogl/cogl/cogl-texture-2d-sliced.c | 1397 ----
clutter/cogl/cogl/cogl-texture-2d.c | 741 ---
clutter/cogl/cogl/cogl-texture-3d-private.h | 98 -
clutter/cogl/cogl/cogl-texture-3d.c | 681 --
clutter/cogl/cogl/cogl-texture-3d.h | 154 -
clutter/cogl/cogl/cogl-texture-driver.h | 213 -
clutter/cogl/cogl/cogl-texture-private.h | 303 -
clutter/cogl/cogl/cogl-texture-rectangle-private.h | 75 -
clutter/cogl/cogl/cogl-texture-rectangle.c | 652 --
clutter/cogl/cogl/cogl-texture.c | 1533 -----
clutter/cogl/cogl/cogl-texture.h | 464 --
clutter/cogl/cogl/cogl-types.h | 674 --
clutter/cogl/cogl/cogl-util.c | 240 -
clutter/cogl/cogl/cogl-util.h | 106 -
clutter/cogl/cogl/cogl-vector.c | 284 -
clutter/cogl/cogl/cogl-vector.h | 389 --
clutter/cogl/cogl/cogl-vertex-array-private.h | 39 -
clutter/cogl/cogl/cogl-vertex-array.c | 77 -
clutter/cogl/cogl/cogl-vertex-array.h | 82 -
clutter/cogl/cogl/cogl-vertex-buffer-private.h | 164 -
clutter/cogl/cogl/cogl-vertex-buffer.c | 1772 -----
clutter/cogl/cogl/cogl-vertex-buffer.h | 409 --
clutter/cogl/cogl/cogl-xlib-private.h | 76 -
clutter/cogl/cogl/cogl-xlib.c | 184 -
clutter/cogl/cogl/cogl-xlib.h | 84 -
clutter/cogl/cogl/cogl.c | 1103 ----
clutter/cogl/cogl/cogl.h | 1262 ----
clutter/cogl/cogl/cogl.pc.in | 13 -
clutter/cogl/cogl/cogl2-clip-state.c | 49 -
clutter/cogl/cogl/cogl2-clip-state.h | 52 -
clutter/cogl/cogl/cogl2-path.c | 1572 -----
clutter/cogl/cogl/cogl2-path.h | 506 --
clutter/cogl/cogl/driver/Makefile.am | 7 -
.../cogl/cogl/driver/gl/cogl-context-driver-gl.h | 53 -
.../cogl/driver/gl/cogl-feature-functions-gl.h | 423 --
clutter/cogl/cogl/driver/gl/cogl-gl.c | 262 -
.../cogl/cogl/driver/gl/cogl-texture-driver-gl.c | 522 --
.../cogl/driver/gles/cogl-context-driver-gles.h | 52 -
.../cogl/driver/gles/cogl-feature-functions-gles.h | 141 -
clutter/cogl/cogl/driver/gles/cogl-gles.c | 150 -
.../cogl/driver/gles/cogl-texture-driver-gles.c | 511 --
clutter/cogl/cogl/stb_image.c | 3891 -----------
clutter/cogl/cogl/tesselator/GL/glu.h | 40 -
clutter/cogl/cogl/tesselator/README | 446 --
clutter/cogl/cogl/tesselator/dict-list.h | 100 -
clutter/cogl/cogl/tesselator/dict.c | 111 -
clutter/cogl/cogl/tesselator/dict.h | 100 -
clutter/cogl/cogl/tesselator/geom.c | 264 -
clutter/cogl/cogl/tesselator/geom.h | 84 -
clutter/cogl/cogl/tesselator/gluos.h | 1 -
clutter/cogl/cogl/tesselator/memalloc.h | 42 -
clutter/cogl/cogl/tesselator/mesh.c | 798 ---
clutter/cogl/cogl/tesselator/mesh.h | 266 -
clutter/cogl/cogl/tesselator/normal.c | 257 -
clutter/cogl/cogl/tesselator/normal.h | 45 -
clutter/cogl/cogl/tesselator/priorityq-heap.c | 256 -
clutter/cogl/cogl/tesselator/priorityq-heap.h | 107 -
clutter/cogl/cogl/tesselator/priorityq-sort.h | 117 -
clutter/cogl/cogl/tesselator/priorityq.c | 260 -
clutter/cogl/cogl/tesselator/priorityq.h | 117 -
clutter/cogl/cogl/tesselator/render.c | 502 --
clutter/cogl/cogl/tesselator/render.h | 52 -
clutter/cogl/cogl/tesselator/sweep.c | 1361 ----
clutter/cogl/cogl/tesselator/sweep.h | 77 -
clutter/cogl/cogl/tesselator/tess.c | 632 --
clutter/cogl/cogl/tesselator/tess.h | 165 -
clutter/cogl/cogl/tesselator/tesselator.h | 121 -
clutter/cogl/cogl/tesselator/tessmono.c | 201 -
clutter/cogl/cogl/tesselator/tessmono.h | 71 -
.../cogl/winsys/cogl-texture-pixmap-x11-private.h | 92 -
clutter/cogl/cogl/winsys/cogl-texture-pixmap-x11.c | 1430 ----
clutter/cogl/cogl/winsys/cogl-texture-pixmap-x11.h | 155 -
clutter/cogl/cogl/winsys/cogl-winsys-egl.c | 45 -
.../winsys/cogl-winsys-glx-feature-functions.h | 105 -
clutter/cogl/cogl/winsys/cogl-winsys-glx.c | 1329 ----
clutter/cogl/cogl/winsys/cogl-winsys-osx.c | 35 -
clutter/cogl/cogl/winsys/cogl-winsys-private.h | 118 -
clutter/cogl/cogl/winsys/cogl-winsys-sdl.c | 35 -
clutter/cogl/cogl/winsys/cogl-winsys-stub.c | 107 -
clutter/cogl/cogl/winsys/cogl-winsys-win32.c | 35 -
clutter/cogl/cogl/winsys/cogl-winsys.c | 45 -
clutter/cogl/configure.ac | 460 --
clutter/cogl/doc/CODING_STYLE | 49 -
clutter/cogl/pango/Makefile.am | 54 -
clutter/cogl/pango/cogl-pango-display-list.c | 434 --
clutter/cogl/pango/cogl-pango-display-list.h | 70 -
clutter/cogl/pango/cogl-pango-fontmap.c | 209 -
clutter/cogl/pango/cogl-pango-glyph-cache.c | 317 -
clutter/cogl/pango/cogl-pango-glyph-cache.h | 93 -
clutter/cogl/pango/cogl-pango-private.h | 38 -
clutter/cogl/pango/cogl-pango-render.c | 769 ---
clutter/cogl/pango/cogl-pango.h | 85 -
clutter/cogl/po/ChangeLog | 12 -
clutter/cogl/po/Makevars | 41 -
clutter/cogl/po/POTFILES.in | 1 -
clutter/cogl/po/Rules-quot | 47 -
clutter/cogl/po/boldquot.sed | 10 -
clutter/cogl/po/en boldquot header | 25 -
clutter/cogl/po/en quot header | 22 -
clutter/cogl/po/insert-header.sin | 23 -
clutter/cogl/po/quot.sed | 6 -
clutter/cogl/po/remove-potcdate.sin | 19 -
clutter/egl/clutter-backend-cex100.c | 369 --
clutter/egl/clutter-backend-cex100.h | 60 -
clutter/egl/clutter-backend-egl.c | 765 +--
clutter/egl/clutter-backend-egl.h | 57 +-
clutter/egl/clutter-stage-egl.c | 232 +-
clutter/egl/clutter-stage-egl.h | 4 +-
clutter/glx/clutter-backend-glx.h | 11 +-
clutter/glx/clutter-glx-texture-pixmap.c | 4 -
clutter/glx/clutter-stage-glx.c | 9 +-
clutter/wayland/clutter-backend-wayland.c | 16 +-
clutter/win32/clutter-backend-win32.c | 348 +-
clutter/win32/clutter-backend-win32.h | 6 +-
clutter/win32/clutter-event-win32.c | 8 +
clutter/win32/clutter-stage-win32.c | 59 +-
clutter/win32/clutter-stage-win32.h | 3 +-
clutter/x11/clutter-stage-x11.c | 134 +-
clutter/x11/clutter-stage-x11.h | 20 +-
clutter/x11/clutter-x11-texture-pixmap.c | 6 +-
configure.ac | 392 +--
doc/reference/Makefile.am | 4 +-
doc/reference/cogl/Makefile.am | 151 -
doc/reference/cogl/blend-strings.xml | 129 -
doc/reference/cogl/cogl-docs.xml.in | 206 -
doc/reference/cogl/cogl-sections.txt | 660 --
doc/reference/cogl/cogl_ortho.png | Bin 12650 -> 0 bytes
doc/reference/cogl/fill-rule-even-odd.png | Bin 3121 -> 0 bytes
doc/reference/cogl/fill-rule-non-zero.png | Bin 3143 -> 0 bytes
doc/reference/cogl/quad-indices-order.png | Bin 2620 -> 0 bytes
doc/reference/cogl/quad-indices-triangles.png | Bin 8018 -> 0 bytes
po/POTFILES.in | 1 -
po/clutter-1.0.pot | 1085 ++--
po/es.po | 367 +-
po/gl.po | 1345 ++--
tests/conform/test-cogl-texture-pixmap-x11.c | 4 +-
tests/conform/test-pick.c | 14 +-
tests/interactive/test-box-layout.c | 2 +-
tests/interactive/test-pixmap.c | 119 +-
tests/interactive/test-table-layout.c | 2 +-
303 files changed, 2171 insertions(+), 89530 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
