From 173d38a28429bc0bcee013c949dc4e3c13d966a1 Mon Sep 17 00:00:00 2001
From: Emmanuele Bassi <ebassi@openedhand.com>
Date: Mon, 16 Apr 2007 10:26:11 +0000
Subject: [PATCH] Update changelogs for SVN merge.

---
 ChangeLog               | 14 ++++++++++++++
 doc/reference/ChangeLog |  7 +++++++
 2 files changed, 21 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 02b62e824..8974fd218 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2007-04-16  Emmanuele Bassi  <ebassi@openedhand.com>
+
+	Merge from clutter.git
+
+	* clutter/clutter-behaviour-bspline.[ch]: Return a ClutterBehaviour
+	when splicing the b-spline; fix the header and the API documentation;
+	hush the compiler warnings; kill of some pointer indirections.
+
+	* clutter/clutter-behaviour-rotate.[ch]: Add a rotate behaviour,
+	with user defined axis, direction and sweep angle.
+
+	* clutter/clutter-behaviour.c (clutter_behaviour_is_applied): Add
+	a parameter ISA check and return FALSE if it fails.
+
 2007-04-12  Tomas Frydrych  <tf@openedhand.com>
 
 	* clutter/clutter-behaviour.h:
diff --git a/doc/reference/ChangeLog b/doc/reference/ChangeLog
index 431422931..08f8cf511 100644
--- a/doc/reference/ChangeLog
+++ b/doc/reference/ChangeLog
@@ -1,3 +1,10 @@
+2007-04-16  Emmanuele Bassi  <ebassi@openedhand.com>
+
+	* clutter-docs.sgml:
+	* clutter-sections.txt:
+	* clutter.types: Add new b-spline and rotate behaviours
+	to the API documentation.
+
 2007-03-27  Emmanuele Bassi  <ebassi@openedhand.com>
 
 	* Makefile.am: Ignore clutter/cogl: it's private API.