diff options
| author | Emmanuele Bassi <ebassi@gnome.org> | 2015-01-03 20:34:20 +0000 |
|---|---|---|
| committer | Emmanuele Bassi <ebassi@gnome.org> | 2015-01-03 20:34:20 +0000 |
| commit | 77ec8774a08c884d8acdf6c5f36a3e5003596626 (patch) | |
| tree | a1ebb161dd9d46d9df5545db0dbbcd2727747e68 /clutter/clutter-content.c | |
| parent | c3c89332f6541848b5c3853858249e39b116b4fd (diff) | |
| download | clutter-77ec8774a08c884d8acdf6c5f36a3e5003596626.tar.gz | |
WARNING: Massive revert commit
Revert all the work that happened on the master branch.
Sadly, this is the only way to merge the current development branch back
into master.
It is now abundantly clear that I merged the 1.99 branch far too soon,
and that Clutter 2.0 won't happen any time soon, if at all.
Since having the development happen on a separate branch throws a lot of
people into confusion, let's undo the clutter-1.99 → master merge, and
move back the development of Clutter to the master branch.
In order to do so, we need to do some surgery to the Git repository.
First, we do a massive revert in a single commit of all that happened
since the switch to 1.99 and the API version bump done with the
89a2862b057423c3c1fc666e6fa776ccacf377dd commit. The history is too long
to be reverted commit by commit without being extremely messy.
Diffstat (limited to 'clutter/clutter-content.c')
| -rw-r--r-- | clutter/clutter-content.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/clutter/clutter-content.c b/clutter/clutter-content.c index cd5f58adc..26d8f2672 100644 --- a/clutter/clutter-content.c +++ b/clutter/clutter-content.c @@ -119,7 +119,7 @@ clutter_content_default_init (ClutterContentInterface *iface) * This signal is emitted each time a #ClutterContent implementation is * assigned to a #ClutterActor. * - * + * Since: 1.10 */ content_signals[ATTACHED] = g_signal_new (I_("attached"), @@ -139,7 +139,7 @@ clutter_content_default_init (ClutterContentInterface *iface) * This signal is emitted each time a #ClutterContent implementation is * removed from a #ClutterActor. * - * + * Since: 1.10 */ content_signals[DETACHED] = g_signal_new (I_("detached"), @@ -162,7 +162,7 @@ clutter_content_default_init (ClutterContentInterface *iface) * they change the way a the content should be painted regardless of the * actor state. * - * + * Since: 1.10 */ void clutter_content_invalidate (ClutterContent *content) @@ -290,7 +290,7 @@ _clutter_content_paint_content (ClutterContent *content, * Return value: %TRUE if the content has a preferred size, and %FALSE * otherwise * - * + * Since: 1.10 */ gboolean clutter_content_get_preferred_size (ClutterContent *content, |