Emmanuele Bassi c74dfa96ca 2008-05-28 Emmanuele Bassi <ebassi@openedhand.com> ... Fix merging of objects with the same id. * clutter/clutter-script.c: (json_object_end): If there already is an ObjectInfo under the parsed id, merge the construction with the currently stored state. (parse_children), (parse_signals), (parse_behaviours): Append the newly parsed children, signals and behaviours, in case the ObjectInfo already has unresolved items. (clutter_script_construct_object): Fix a typo in the type check. (clutter_script_init): Do not copy the key inside the hash table holding the objects - we are already holding it inside the value.		2008-05-28 12:09:41 +00:00
..
cogl	* clutter/cogl/gles/cogl-gles2-wrapper.c (cogl_wrap_glGetFixedv):	2008-05-28 11:29:58 +00:00
eglnative
eglx
fruity
glx
json
osx	Merged clutter-ivan branch into trunk.	2008-04-25 13:37:36 +00:00
pango	* clutter/cogl/cogl.h.in:	2008-05-07 16:12:54 +00:00
sdl
win32
x11	2008-05-26 Matthew Allum <mallum@openedhand.com>	2008-05-26 20:55:53 +00:00
clutter-actor.c
clutter-actor.h	2008-04-23 Emmanuele Bassi <ebassi@openedhand.com>	2008-04-23 12:53:25 +00:00
clutter-alpha.c
clutter-alpha.h	2008-04-18 Emmanuele Bassi <ebassi@openedhand.com>	2008-04-18 15:03:30 +00:00
clutter-backend.c
clutter-backend.h
clutter-behaviour-bspline.c	2007-11-19 Emmanuele Bassi <ebassi@openedhand.com>	2007-11-19 16:35:46 +00:00
clutter-behaviour-bspline.h
clutter-behaviour-depth.c
clutter-behaviour-depth.h
clutter-behaviour-ellipse.c
clutter-behaviour-ellipse.h
clutter-behaviour-opacity.c
clutter-behaviour-opacity.h
clutter-behaviour-path.c	2008-02-08 Emmanuele Bassi <ebassi@openedhand.com>	2008-02-08 15:39:41 +00:00
clutter-behaviour-path.h
clutter-behaviour-rotate.c	2007-12-17 Tomas Frydrych <tf@openedhand.com>	2007-12-17 17:16:49 +00:00
clutter-behaviour-rotate.h
clutter-behaviour-scale.c	2008-02-11 Matthew Allum <mallum@openedhand.com>	2008-02-11 20:31:16 +00:00
clutter-behaviour-scale.h
clutter-behaviour.c
clutter-behaviour.h
clutter-clone-texture.c
clutter-clone-texture.h	2006-12-12 Emmanuele Bassi <ebassi@openedhand.com>	2006-12-12 20:20:04 +00:00
clutter-color.c
clutter-color.h
clutter-container.c
clutter-container.h
clutter-debug.h
clutter-deprecated.h
clutter-effect.c	2008-04-30 Emmanuele Bassi <ebassi@openedhand.com>	2008-04-30 16:27:18 +00:00
clutter-effect.h
clutter-entry.c
clutter-entry.h
clutter-enum-types.c.in
clutter-enum-types.h.in
clutter-event.c
clutter-event.h	2008-05-15 Emmanuele Bassi <ebassi@openedhand.com>	2008-05-15 14:31:43 +00:00
clutter-feature.c
clutter-feature.h	2008-05-15 Emmanuele Bassi <ebassi@openedhand.com>	2008-05-15 14:31:43 +00:00
clutter-fixed.c
clutter-fixed.h
clutter-frame-source.c
clutter-frame-source.h
clutter-group.c	2008-05-23 Emmanuele Bassi <ebassi@openedhand.com>	2008-05-23 09:42:32 +00:00
clutter-group.h
clutter-id-pool.c
clutter-id-pool.h
clutter-json.h.in
clutter-keysyms-table.h
clutter-keysyms.h
clutter-label.c
clutter-label.h
clutter-list-model.c
clutter-list-model.h
clutter-main.c
clutter-main.h
clutter-marshal.list
clutter-media.c
clutter-media.h
clutter-model-private.h
clutter-model.c
clutter-model.h
clutter-private.h
clutter-rectangle.c	2008-05-28 Emmanuele Bassi <ebassi@openedhand.com>	2008-05-28 08:58:44 +00:00
clutter-rectangle.h
clutter-score.c
clutter-score.h
clutter-script-parser.c
clutter-script-private.h
clutter-script.c
clutter-script.h
clutter-scriptable.c
clutter-scriptable.h
clutter-shader.c
clutter-shader.h
clutter-stage-manager.c
clutter-stage-manager.h	2008-03-28 Matthew Allum <mallum@openedhand.com>	2008-03-28 22:50:55 +00:00
clutter-stage-window.c
clutter-stage-window.h
clutter-stage.c
clutter-stage.h
clutter-texture.c
clutter-texture.h
clutter-timeline.c	2008-05-12 Robert Bragg <bob@openedhand.com>	2008-05-12 15:18:38 +00:00
clutter-timeline.h	2008-03-18 Emmanuele Bassi <ebassi@openedhand.com>	2008-03-18 22:07:17 +00:00
clutter-timeout-pool.c
clutter-timeout-pool.h
clutter-types.h	2008-03-28 Matthew Allum <mallum@openedhand.com>	2008-03-28 22:50:55 +00:00
clutter-units.c	2008-05-09 Emmanuele Bassi <ebassi@openedhand.com>	2008-05-09 10:58:26 +00:00
clutter-units.h	2008-04-17 Emmanuele Bassi <ebassi@openedhand.com>	2008-04-17 11:09:27 +00:00
clutter-util.c	* clutter/clutter-texture.c: (texture_get_tile_pixbuf),	2008-02-12 17:17:52 +00:00
clutter-util.h
clutter-version.h.in	2008-03-31 Matthew Allum <mallum@openedhand.com>	2008-03-31 17:15:02 +00:00
clutter.h
Makefile.am