[clutter/msvc-support: 57/58] Merge branch 'msvc-support-2.0' into msvc-support

From: Chun-wei Fan <fanchunwei src gnome org>
To: commits-list gnome org
Cc:
Subject: [clutter/msvc-support: 57/58] Merge branch 'msvc-support-2.0' into msvc-support
Date: Fri, 16 Sep 2011 08:08:20 +0000 (UTC)
commit d99976a5be472519f2c247e936421a1ed593193d
Merge: 4e09bc1 f884d1b
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Fri Sep 16 16:24:20 2011 +0800

    Merge branch 'msvc-support-2.0' into msvc-support
    
    Conflicts:
    	build/win32/vs10/README.txt
    	build/win32/vs10/clutter.props
    	build/win32/vs9/README.txt
    	build/win32/vs9/clutter.vsprops
    	clutter/clutter-behaviour-path.c
    	clutter/clutter-behaviour-rotate.c
    	clutter/clutter-behaviour-scale.h
    	clutter/clutter-behaviour.h
    	clutter/clutter.symbols
    	configure.ac
    	tests/conform/test-conform-main.c

 build/win32/vs10/README.txt                |    7 +
 build/win32/vs10/clutter.props             |   34 +-
 build/win32/vs9/README.txt                 |    3 +
 build/win32/vs9/clutter.vsprops            |   21 +-
 clutter/Makefile.am                        |   50 +-
 clutter/clutter-actor.c                    |  418 +-----
 clutter/clutter-actor.h                    |   23 -
 clutter/clutter-backend.c                  |  184 ---
 clutter/clutter-backend.h                  |   14 -
 clutter/clutter-behaviour-depth.c          |  305 ----
 clutter/clutter-behaviour-depth.h          |  101 --
 clutter/clutter-behaviour-ellipse.c        | 1064 -------------
 clutter/clutter-behaviour-ellipse.h        |  147 --
 clutter/clutter-behaviour-opacity.c        |  319 ----
 clutter/clutter-behaviour-opacity.h        |  116 --
 clutter/clutter-behaviour-path.h           |  135 --
 clutter/clutter-behaviour-rotate.h         |  115 --
 clutter/clutter-behaviour-scale.c          |  439 ------
 clutter/clutter-behaviour.c                |  708 ---------
 clutter/clutter-deprecated.h               |  205 ---
 clutter/clutter-frame-source.c             |  263 ----
 clutter/clutter-frame-source.h             |   51 -
 clutter/clutter-group.h                    |   14 -
 clutter/clutter-keysyms-compat.h           | 2290 ----------------------------
 clutter/clutter-keysyms-update.pl          |   45 +-
 clutter/clutter-keysyms.h                  |    5 -
 clutter/clutter-main.c                     |   77 +-
 clutter/clutter-main.h                     |   16 -
 clutter/clutter-path.c                     |   62 +
 clutter/clutter-private.h                  |    2 -
 clutter/clutter-script.c                   |    1 -
 clutter/clutter-shader.c                   |  950 ------------
 clutter/clutter-shader.h                   |  149 --
 clutter/clutter-stage-manager.c            |   17 -
 clutter/clutter-stage-manager.h            |    5 -
 clutter/clutter-stage.c                    |   10 +-
 clutter/clutter-stage.h                    |   41 -
 clutter/clutter-texture.c                  |   18 -
 clutter/clutter-timeout-interval.c         |  140 --
 clutter/clutter-timeout-interval.h         |   58 -
 clutter/clutter-timeout-pool.c             |  497 ------
 clutter/clutter-timeout-pool.h             |   69 -
 clutter/clutter-types.h                    |    4 -
 clutter/clutter-util.c                     |   29 -
 clutter/clutter-util.h                     |   43 -
 clutter/clutter.h                          |   13 -
 clutter/clutter.symbols                    |  143 +--
 clutter/cogl/clutter-glx-texture-pixmap.c  |  158 --
 clutter/cogl/clutter-glx-texture-pixmap.h  |   92 --
 clutter/cogl/clutter-glx.h                 |   36 -
 clutter/cogl/clutter-stage-cogl.c          |    1 -
 clutter/osx/clutter-backend-osx.c          |    3 -
 clutter/win32/clutter-backend-win32.c      |    3 -
 clutter/x11/clutter-backend-x11.c          |   23 -
 clutter/x11/clutter-stage-x11.c            |   31 -
 clutter/x11/clutter-x11.h                  |    8 -
 configure.ac                               |   14 +-
 doc/reference/clutter/Makefile.am          |    2 -
 doc/reference/clutter/clutter-docs.xml.in  |    1 -
 doc/reference/clutter/clutter-sections.txt |  106 +-
 tests/conform/Makefile.am                  |    1 -
 tests/conform/test-behaviours.c            |   92 --
 tests/conform/test-conform-main.c          |    4 +-
 tests/conform/test-script-parser.c         |   39 -
 tests/data/test-script.json                |    6 +-
 tests/interactive/Makefile.am              |   12 +-
 tests/interactive/test-behave.c            |  213 ---
 tests/interactive/test-scale.c             |  117 --
 tests/interactive/test-script.c            |   87 --
 tests/interactive/test-shader.c            |  416 -----
 tests/interactive/test-texture-async.c     |   23 +-
 71 files changed, 155 insertions(+), 10753 deletions(-)
---
diff --cc build/win32/vs10/README.txt
index a4d578c,68dccd4..a18c8f6
--- a/build/win32/vs10/README.txt
+++ b/build/win32/vs10/README.txt
@@@ -1,19 -1,10 +1,26 @@@
  Note that all this is rather experimental.
  
++<<<<<<< HEAD
 +A more detailed description on using Visual C++ to compile Clutter with
 +its dependencies can be found on the following GNOME Live! page:
 +
 +https://live.gnome.org/GTK%2B/Win32/MSVCCompilationOfGTKStack
 +
 +Please do not attempt to compile Clutter in a path that contains spaces
 +to avoid potential problems during compilation, linking or usage.
 +
++=======
++>>>>>>> msvc-support-2.0
  This VS10 solution and the projects it includes are intented to be used
  in a Clutter source tree unpacked from a tarball. In a git checkout you
  first need to use some Unix-like environment or manual work to expand
  the files needed, like config.h.win32.in into config.h.win32 and the
++<<<<<<< HEAD
 +.vcprojxin and .vcxproj.filtersin files here into corresponding actual
 +.vcxproj and .vcxproj.filters files.
++=======
+ .vcprojin files here into corresponding actual .vcproj files.
++>>>>>>> msvc-support-2.0
  
  You will need the parts from GNOME: Cogl, JSON-GLib, GDK-Pixbuf,
  Pango*, atk and GLib. External dependencies are at least zlib, libpng,
diff --cc build/win32/vs10/clutter.props
index cdf994f,aefe049..0e19e92
--- a/build/win32/vs10/clutter.props
+++ b/build/win32/vs10/clutter.props
@@@ -38,7 -38,7 +38,11 @@@ if exist ..\..\..\clutter\clutter-enum-
  
  cd ..\..\..\clutter
  
++<<<<<<< HEAD
 +perl $(GlibEtcInstallRoot)\bin\glib-mkenums --template clutter-enum-types.h.in ./clutter-action.h ./clutter-actor-meta.h ./clutter-actor.h ./clutter-align-constraint.h ./clutter-alpha.h ./clutter-animatable.h ./clutter-animation.h ./clutter-animator.h ./clutter-backend.h ./clutter-behaviour.h ./clutter-behaviour-depth.h ./clutter-behaviour-ellipse.h ./clutter-behaviour-opacity.h ./clutter-behaviour-path.h ./clutter-behaviour-rotate.h ./clutter-behaviour-scale.h ./clutter-bind-constraint.h ./clutter-binding-pool.h ./clutter-bin-layout.h ./clutter-blur-effect.h ./clutter-box.h  ./clutter-box-layout.h ./clutter-cairo-texture.h ./clutter-child-meta.h ./clutter-click-action.h ./clutter-clone.h ./clutter-color-static.h ./clutter-color.h ./clutter-colorize-effect.h ./clutter-constraint.h ./clutter-container.h ./clutter-deform-effect.h ./clutter-deprecated.h ./clutter-desaturate-effect.h ./clutter-device-manager.h ./clutter-drag-action.h ./clutter-drop-action.h ./clutter-effect.h .
 /clutter-event.h ./clutter-feature.h ./clutter-fixed.h ./clutter-fixed-layout.h ./clutter-flow-layout.h ./clutter-frame-source.h ./clutter-group.h ./clutter-input-device.h ./clutter-interval.h ./clutter-keysyms.h ./clutter-keysyms-compat.h ./clutter-layout-manager.h ./clutter-layout-meta.h ./clutter-list-model.h ./clutter-main.h ./clutter-media.h ./clutter-model.h ./clutter-offscreen-effect.h ./clutter-page-turn-effect.h ./clutter-path-constraint.h ./clutter-path.h ./clutter-rectangle.h ./clutter-score.h ./clutter-script.h ./clutter-scriptable.h ./clutter-settings.h ./clutter-shader.h ./clutter-shader-effect.h ./clutter-shader-types.h ./clutter-snap-constraint.h ./clutter-stage.h ./clutter-stage-manager.h ./clutter-stage-window.h ./clutter-state.h ./clutter-swipe-action.h ./clutter-table-layout.h ./clutter-texture.h ./clutter-text.h ./clutter-timeline.h ./clutter-timeout-pool.h ./clutter-types.h ./clutter-units.h ./clutter-util.h ./win32/clutter-win32.h &gt; clutter-enum-typ
 es.h
++=======
+ perl $(GlibEtcInstallRoot)\bin\glib-mkenums --template clutter-enum-types.h.in ./clutter-action.h ./clutter-actor-meta.h ./clutter-actor.h ./clutter-align-constraint.h ./clutter-alpha.h ./clutter-animatable.h ./clutter-animation.h ./clutter-animator.h ./clutter-backend.h ./clutter-bind-constraint.h ./clutter-binding-pool.h ./clutter-bin-layout.h ./clutter-blur-effect.h ./clutter-box.h  ./clutter-box-layout.h ./clutter-cairo-texture.h ./clutter-child-meta.h ./clutter-click-action.h ./clutter-clone.h ./clutter-color-static.h ./clutter-color.h ./clutter-colorize-effect.h ./clutter-constraint.h ./clutter-container.h ./clutter-deform-effect.h ./clutter-desaturate-effect.h ./clutter-device-manager.h ./clutter-drag-action.h ./clutter-drop-action.h ./clutter-effect.h ./clutter-event.h ./clutter-feature.h ./clutter-fixed.h ./clutter-fixed-layout.h ./clutter-flow-layout.h ./clutter-group.h ./clutter-input-device.h ./clutter-interval.h ./clutter-keysyms.h ./clutter-layout-manager.h ./
 clutter-layout-meta.h ./clutter-list-model.h ./clutter-main.h ./clutter-media.h ./clutter-model.h ./clutter-offscreen-effect.h ./clutter-page-turn-effect.h ./clutter-path-constraint.h ./clutter-path.h ./clutter-rectangle.h ./clutter-score.h ./clutter-script.h ./clutter-scriptable.h ./clutter-settings.h ./clutter-shader-effect.h ./clutter-shader-types.h ./clutter-snap-constraint.h ./clutter-stage.h ./clutter-stage-manager.h ./clutter-stage-window.h ./clutter-state.h ./clutter-table-layout.h ./clutter-texture.h ./clutter-text.h ./clutter-timeline.h ./clutter-types.h ./clutter-units.h ./win32/clutter-win32.h &gt; clutter-enum-types.h
++>>>>>>> msvc-support-2.0
  
  cd ..\build\win32\vs10
  
@@@ -49,7 -49,7 +53,11 @@@ if exist ..\..\..\clutter\clutter-enum-
  
  cd ..\..\..\clutter
  
++<<<<<<< HEAD
 +perl $(GlibEtcInstallRoot)\bin\glib-mkenums --template clutter-enum-types.c.in ./clutter-action.h ./clutter-actor-meta.h ./clutter-actor.h ./clutter-align-constraint.h ./clutter-alpha.h ./clutter-animatable.h ./clutter-animation.h ./clutter-animator.h ./clutter-backend.h ./clutter-behaviour.h ./clutter-behaviour-depth.h ./clutter-behaviour-ellipse.h ./clutter-behaviour-opacity.h ./clutter-behaviour-path.h ./clutter-behaviour-rotate.h ./clutter-behaviour-scale.h ./clutter-bind-constraint.h ./clutter-binding-pool.h ./clutter-bin-layout.h ./clutter-blur-effect.h ./clutter-box.h  ./clutter-box-layout.h ./clutter-cairo-texture.h ./clutter-child-meta.h ./clutter-click-action.h ./clutter-clone.h ./clutter-color-static.h ./clutter-color.h ./clutter-colorize-effect.h ./clutter-constraint.h ./clutter-container.h ./clutter-deform-effect.h ./clutter-deprecated.h ./clutter-desaturate-effect.h ./clutter-device-manager.h ./clutter-drag-action.h ./clutter-drop-action.h ./clutter-effect.h .
 /clutter-event.h ./clutter-feature.h ./clutter-fixed.h ./clutter-fixed-layout.h ./clutter-flow-layout.h ./clutter-frame-source.h ./clutter-group.h ./clutter-input-device.h ./clutter-interval.h ./clutter-keysyms.h ./clutter-keysyms-compat.h ./clutter-layout-manager.h ./clutter-layout-meta.h ./clutter-list-model.h ./clutter-main.h ./clutter-media.h ./clutter-model.h ./clutter-offscreen-effect.h ./clutter-page-turn-effect.h ./clutter-path-constraint.h ./clutter-path.h ./clutter-rectangle.h ./clutter-score.h ./clutter-script.h ./clutter-scriptable.h ./clutter-settings.h ./clutter-shader.h ./clutter-shader-effect.h ./clutter-shader-types.h ./clutter-snap-constraint.h ./clutter-stage.h ./clutter-stage-manager.h ./clutter-stage-window.h ./clutter-state.h ./clutter-swipe-action.h ./clutter-table-layout.h ./clutter-texture.h ./clutter-text.h ./clutter-timeline.h ./clutter-timeout-pool.h ./clutter-types.h ./clutter-units.h ./clutter-util.h ./win32/clutter-win32.h &gt; clutter-enum-typ
 es.c
++=======
+ perl $(GlibEtcInstallRoot)\bin\glib-mkenums --template clutter-enum-types.c.in ./clutter-action.h ./clutter-actor-meta.h ./clutter-actor.h ./clutter-align-constraint.h ./clutter-alpha.h ./clutter-animatable.h ./clutter-animation.h ./clutter-animator.h ./clutter-backend.h ./clutter-bind-constraint.h ./clutter-binding-pool.h ./clutter-bin-layout.h ./clutter-blur-effect.h ./clutter-box.h  ./clutter-box-layout.h ./clutter-cairo-texture.h ./clutter-child-meta.h ./clutter-click-action.h ./clutter-clone.h ./clutter-color-static.h ./clutter-color.h ./clutter-colorize-effect.h ./clutter-constraint.h ./clutter-container.h ./clutter-deform-effect.h ./clutter-desaturate-effect.h ./clutter-device-manager.h ./clutter-drag-action.h ./clutter-drop-action.h ./clutter-effect.h ./clutter-event.h ./clutter-feature.h ./clutter-fixed.h ./clutter-fixed-layout.h ./clutter-flow-layout.h ./clutter-group.h ./clutter-input-device.h ./clutter-interval.h ./clutter-keysyms.h ./clutter-layout-manager.h ./
 clutter-layout-meta.h ./clutter-list-model.h ./clutter-main.h ./clutter-media.h ./clutter-model.h ./clutter-offscreen-effect.h ./clutter-page-turn-effect.h ./clutter-path-constraint.h ./clutter-path.h ./clutter-rectangle.h ./clutter-score.h ./clutter-script.h ./clutter-scriptable.h ./clutter-settings.h ./clutter-shader-effect.h ./clutter-shader-types.h ./clutter-snap-constraint.h ./clutter-stage.h ./clutter-stage-manager.h ./clutter-stage-window.h ./clutter-state.h ./clutter-table-layout.h ./clutter-texture.h ./clutter-text.h ./clutter-timeline.h ./clutter-types.h ./clutter-units.h ./win32/clutter-win32.h &gt; clutter-enum-types.c
++>>>>>>> msvc-support-2.0
  
  cd ..\build\win32\vs10
  
diff --cc build/win32/vs9/README.txt
index d8b5193,588ed5c..20b4f0f
--- a/build/win32/vs9/README.txt
+++ b/build/win32/vs9/README.txt
@@@ -1,13 -1,5 +1,16 @@@
  Note that all this is rather experimental.
  
++<<<<<<< HEAD
 +A more detailed description on using Visual C++ to compile Clutter with
 +its dependencies can be found on the following GNOME Live! page:
 +
 +https://live.gnome.org/GTK%2B/Win32/MSVCCompilationOfGTKStack
 +
 +Please do not attempt to compile Clutter in a path that contains spaces
 +to avoid potential problems during compilation, linking or usage.
 +
++=======
++>>>>>>> msvc-support-2.0
  This VS9 solution and the projects it includes are intented to be used
  in a Clutter source tree unpacked from a tarball. In a git checkout you
  first need to use some Unix-like environment or manual work to expand
diff --cc build/win32/vs9/clutter.vsprops
index e19edcf,d392605..ad17d94
--- a/build/win32/vs9/clutter.vsprops
+++ b/build/win32/vs9/clutter.vsprops
@@@ -75,13 -75,13 +75,21 @@@ copy ..\..\..\clutter\clutter-version.h
  
  if exist ..\..\..\clutter\clutter-enum-types.h goto DONE_CLUTTER_ENUM_H&#x0D;&#x0A;
  cd ..\..\..\clutter&#x0D;&#x0A;
++<<<<<<< HEAD
 +perl $(GlibEtcInstallRoot)\bin\glib-mkenums --template clutter-enum-types.h.in ./clutter-action.h ./clutter-actor-meta.h ./clutter-actor.h ./clutter-align-constraint.h ./clutter-alpha.h ./clutter-animatable.h ./clutter-animation.h ./clutter-animator.h ./clutter-backend.h ./clutter-behaviour.h ./clutter-behaviour-depth.h ./clutter-behaviour-ellipse.h ./clutter-behaviour-opacity.h ./clutter-behaviour-path.h ./clutter-behaviour-rotate.h ./clutter-behaviour-scale.h ./clutter-bind-constraint.h ./clutter-binding-pool.h ./clutter-bin-layout.h ./clutter-blur-effect.h ./clutter-box.h	 ./clutter-box-layout.h ./clutter-cairo-texture.h ./clutter-child-meta.h ./clutter-click-action.h ./clutter-clone.h ./clutter-color-static.h ./clutter-color.h ./clutter-colorize-effect.h ./clutter-constraint.h ./clutter-container.h ./clutter-deform-effect.h ./clutter-deprecated.h ./clutter-desaturate-effect.h ./clutter-device-manager.h ./clutter-drag-action.h ./clutter-drop-action.h ./clutter-effect.h .
 /clutter-event.h ./clutter-feature.h ./clutter-fixed.h ./clutter-fixed-layout.h ./clutter-flow-layout.h ./clutter-frame-source.h ./clutter-group.h ./clutter-input-device.h ./clutter-interval.h ./clutter-keysyms.h ./clutter-keysyms-compat.h ./clutter-layout-manager.h ./clutter-layout-meta.h ./clutter-list-model.h ./clutter-main.h ./clutter-media.h ./clutter-model.h ./clutter-offscreen-effect.h ./clutter-page-turn-effect.h ./clutter-path-constraint.h ./clutter-path.h ./clutter-rectangle.h ./clutter-score.h ./clutter-script.h ./clutter-scriptable.h ./clutter-settings.h ./clutter-shader.h ./clutter-shader-effect.h ./clutter-shader-types.h ./clutter-snap-constraint.h ./clutter-stage.h ./clutter-stage-manager.h ./clutter-stage-window.h ./clutter-state.h ./clutter-swipe-action.h ./clutter-table-layout.h ./clutter-texture.h ./clutter-text.h ./clutter-timeline.h ./clutter-timeout-pool.h ./clutter-types.h ./clutter-units.h ./clutter-util.h ./win32/clutter-win32.h &gt; clutter-enum-typ
 es.h&#x0D;&#x0A;
++=======
+ perl $(GlibEtcInstallRoot)\bin\glib-mkenums --template clutter-enum-types.h.in ./clutter-action.h ./clutter-actor-meta.h ./clutter-actor.h ./clutter-align-constraint.h ./clutter-alpha.h ./clutter-animatable.h ./clutter-animation.h ./clutter-animator.h ./clutter-backend.h ./clutter-bind-constraint.h ./clutter-binding-pool.h ./clutter-bin-layout.h ./clutter-blur-effect.h ./clutter-box.h	 ./clutter-box-layout.h ./clutter-cairo-texture.h ./clutter-child-meta.h ./clutter-click-action.h ./clutter-clone.h ./clutter-color-static.h ./clutter-color.h ./clutter-colorize-effect.h ./clutter-constraint.h ./clutter-container.h ./clutter-deform-effect.h ./clutter-desaturate-effect.h ./clutter-device-manager.h ./clutter-drag-action.h ./clutter-drop-action.h ./clutter-effect.h ./clutter-event.h ./clutter-feature.h ./clutter-fixed.h ./clutter-fixed-layout.h ./clutter-flow-layout.h ./clutter-group.h ./clutter-input-device.h ./clutter-interval.h ./clutter-keysyms.h ./clutter-layout-manager.h ./
 clutter-layout-meta.h ./clutter-list-model.h ./clutter-main.h ./clutter-media.h ./clutter-model.h ./clutter-offscreen-effect.h ./clutter-page-turn-effect.h ./clutter-path-constraint.h ./clutter-path.h ./clutter-rectangle.h ./clutter-score.h ./clutter-script.h ./clutter-scriptable.h ./clutter-settings.h ./clutter-shader-effect.h ./clutter-shader-types.h ./clutter-snap-constraint.h ./clutter-stage.h ./clutter-stage-manager.h ./clutter-stage-window.h ./clutter-state.h ./clutter-table-layout.h ./clutter-texture.h ./clutter-text.h ./clutter-timeline.h ./clutter-types.h ./clutter-units.h ./win32/clutter-win32.h &gt; clutter-enum-types.h&#x0D;&#x0A;
++>>>>>>> msvc-support-2.0
  cd ..\build\win32\vs9&#x0D;&#x0A;
  :DONE_CLUTTER_ENUM_H&#x0D;&#x0A;
  
  if exist ..\..\..\clutter\clutter-enum-types.c goto DONE_CLUTTER_ENUM_C&#x0D;&#x0A;
  cd ..\..\..\clutter&#x0D;&#x0A;
++<<<<<<< HEAD
 +perl $(GlibEtcInstallRoot)\bin\glib-mkenums --template clutter-enum-types.c.in ./clutter-action.h ./clutter-actor-meta.h ./clutter-actor.h ./clutter-align-constraint.h ./clutter-alpha.h ./clutter-animatable.h ./clutter-animation.h ./clutter-animator.h ./clutter-backend.h ./clutter-behaviour.h ./clutter-behaviour-depth.h ./clutter-behaviour-ellipse.h ./clutter-behaviour-opacity.h ./clutter-behaviour-path.h ./clutter-behaviour-rotate.h ./clutter-behaviour-scale.h ./clutter-bind-constraint.h ./clutter-binding-pool.h ./clutter-bin-layout.h ./clutter-blur-effect.h ./clutter-box.h	 ./clutter-box-layout.h ./clutter-cairo-texture.h ./clutter-child-meta.h ./clutter-click-action.h ./clutter-clone.h ./clutter-color-static.h ./clutter-color.h ./clutter-colorize-effect.h ./clutter-constraint.h ./clutter-container.h ./clutter-deform-effect.h ./clutter-deprecated.h ./clutter-desaturate-effect.h ./clutter-device-manager.h ./clutter-drag-action.h ./clutter-drop-action.h ./clutter-effect.h .
 /clutter-event.h ./clutter-feature.h ./clutter-fixed.h ./clutter-fixed-layout.h ./clutter-flow-layout.h ./clutter-frame-source.h ./clutter-group.h ./clutter-input-device.h ./clutter-interval.h ./clutter-keysyms.h ./clutter-keysyms-compat.h ./clutter-layout-manager.h ./clutter-layout-meta.h ./clutter-list-model.h ./clutter-main.h ./clutter-media.h ./clutter-model.h ./clutter-offscreen-effect.h ./clutter-page-turn-effect.h ./clutter-path-constraint.h ./clutter-path.h ./clutter-rectangle.h ./clutter-score.h ./clutter-script.h ./clutter-scriptable.h ./clutter-settings.h ./clutter-shader.h ./clutter-shader-effect.h ./clutter-shader-types.h ./clutter-snap-constraint.h ./clutter-stage.h ./clutter-stage-manager.h ./clutter-stage-window.h ./clutter-state.h ./clutter-swipe-action.h ./clutter-table-layout.h ./clutter-texture.h ./clutter-text.h ./clutter-timeline.h ./clutter-timeout-pool.h ./clutter-types.h ./clutter-units.h ./clutter-util.h ./win32/clutter-win32.h &gt; clutter-enum-typ
 es.c&#x0D;&#x0A;
++=======
+ perl $(GlibEtcInstallRoot)\bin\glib-mkenums --template clutter-enum-types.c.in ./clutter-action.h ./clutter-actor-meta.h ./clutter-actor.h ./clutter-align-constraint.h ./clutter-alpha.h ./clutter-animatable.h ./clutter-animation.h ./clutter-animator.h ./clutter-backend.h ./clutter-bind-constraint.h ./clutter-binding-pool.h ./clutter-bin-layout.h ./clutter-blur-effect.h ./clutter-box.h	 ./clutter-box-layout.h ./clutter-cairo-texture.h ./clutter-child-meta.h ./clutter-click-action.h ./clutter-clone.h ./clutter-color-static.h ./clutter-color.h ./clutter-colorize-effect.h ./clutter-constraint.h ./clutter-container.h ./clutter-deform-effect.h ./clutter-desaturate-effect.h ./clutter-device-manager.h ./clutter-drag-action.h ./clutter-drop-action.h ./clutter-effect.h ./clutter-event.h ./clutter-feature.h ./clutter-fixed.h ./clutter-fixed-layout.h ./clutter-flow-layout.h ./clutter-group.h ./clutter-input-device.h ./clutter-interval.h ./clutter-keysyms.h ./clutter-layout-manager.h ./
 clutter-layout-meta.h ./clutter-list-model.h ./clutter-main.h ./clutter-media.h ./clutter-model.h ./clutter-offscreen-effect.h ./clutter-page-turn-effect.h ./clutter-path-constraint.h ./clutter-path.h ./clutter-rectangle.h ./clutter-score.h ./clutter-script.h ./clutter-scriptable.h ./clutter-settings.h ./clutter-shader-effect.h ./clutter-shader-types.h ./clutter-snap-constraint.h ./clutter-stage.h ./clutter-stage-manager.h ./clutter-stage-window.h ./clutter-state.h ./clutter-table-layout.h ./clutter-texture.h ./clutter-text.h ./clutter-timeline.h ./clutter-types.h ./clutter-units.h ./win32/clutter-win32.h &gt; clutter-enum-types.c&#x0D;&#x0A;
++>>>>>>> msvc-support-2.0
  cd ..\build\win32\vs9&#x0D;&#x0A;
  :DONE_CLUTTER_ENUM_C&#x0D;&#x0A;
  
diff --cc clutter/clutter.symbols
index 366bce2,8fd3e78..09baa79
--- a/clutter/clutter.symbols
+++ b/clutter/clutter.symbols
@@@ -285,16 -271,6 +276,19 @@@ clutter_animator_set_duratio
  clutter_animator_set_timeline
  clutter_animator_start
  
++<<<<<<< HEAD
 +#ifdef CLUTTER_ENABLE_EXPERIMENTAL_API
 +clutter_backend_get_cogl_context
 +#endif
 +
 +#ifndef CLUTTER_DISABLE_DEPRECATED
 +clutter_backend_get_double_click_distance
 +clutter_backend_get_double_click_time
 +clutter_backend_get_font_name
 +#endif
 +
++=======
++>>>>>>> msvc-support-2.0
  clutter_backend_get_font_options 
  clutter_backend_get_resolution
  clutter_backend_get_type
@@@ -950,7 -832,6 +857,10 @@@ clutter_set_font_flag
  clutter_set_motion_events_enabled
  #endif
  
++<<<<<<< HEAD
 +clutter_shader_compile
++=======
++>>>>>>> msvc-support-2.0
  clutter_shader_effect_get_program
  clutter_shader_effect_get_shader
  clutter_shader_effect_get_type
@@@ -999,9 -866,9 +895,10 @@@ clutter_stage_get_fo
  clutter_stage_get_fullscreen
  clutter_stage_get_key_focus
  clutter_stage_get_minimum_size
 +clutter_stage_get_motion_events_enabled
  clutter_stage_get_no_clear_hint
  clutter_stage_get_perspective
+ clutter_stage_get_redraw_clip_bounds
  clutter_stage_get_throttle_motion_events
  clutter_stage_get_title
  clutter_stage_get_type
diff --cc configure.ac
index 1f42994,0e53d8c..234acac
--- a/configure.ac
+++ b/configure.ac
@@@ -9,8 -9,8 +9,13 @@@
  # - increase clutter_micro_version to the next odd number
  # - increase clutter_interface_version to the next odd number
  m4_define([clutter_major_version], [1])
++<<<<<<< HEAD
 +m4_define([clutter_minor_version], [7])
 +m4_define([clutter_micro_version], [91])
++=======
+ m4_define([clutter_minor_version], [99])
+ m4_define([clutter_micro_version], [1])
++>>>>>>> msvc-support-2.0
  
  # â for stable releases: increase the interface age by 1 for each release;
  #   if the API changes, set to 0. interface_age and binary_age are used to
diff --cc tests/conform/test-conform-main.c
index 39d1fcd,f1eda71..a4801c9
--- a/tests/conform/test-conform-main.c
+++ b/tests/conform/test-conform-main.c
@@@ -210,11 -207,6 +209,14 @@@ main (int argc, char **argv
  
    TEST_CONFORM_SIMPLE ("/score", test_score);
  
++<<<<<<< HEAD
 +  TEST_CONFORM_SIMPLE ("/behaviours", test_behaviours);
 +
 +  /* FIXME - see bug https://bugzilla.gnome.org/show_bug.cgi?id=655588 */
 +  TEST_CONFORM_TODO ("/cally", cally_text);
 +
++=======
++>>>>>>> msvc-support-2.0
    TEST_CONFORM_SIMPLE ("/cogl", test_cogl_object);
    TEST_CONFORM_SIMPLE ("/cogl", test_cogl_fixed);
    TEST_CONFORM_SIMPLE ("/cogl", test_cogl_backface_culling);
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]