brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into cogl-material

Browse Source 
Conflicts:

	clutter/cogl/gl/cogl-context.c
	clutter/cogl/gl/cogl-context.h
This commit is contained in:
Robert Bragg 2008-12-24 00:59:13 +00:00
commit bb938ac4ff
10 changed files with 321 additions and 321 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
clutter/clutter-behaviour-rotate.c
View File

@ -619,7 +619,7 @@ clutter_behaviour_rotate_get_boundsx (ClutterBehaviourRotate *rotate,
priv = rotate->priv; priv = rotate->priv;
if (angle_start); if (angle_start)
*angle_start = priv->angle_start; *angle_start = priv->angle_start;
if (angle_end) if (angle_end)

2
configure.ac
View File

@ -580,7 +580,7 @@ AC_ARG_ENABLE([maintainer-flags],
enable_maintainer_flags=maintainer_flags_default) enable_maintainer_flags=maintainer_flags_default)
if test "x$enable_maintainer_flags" = "xyes"; then if test "x$enable_maintainer_flags" = "xyes"; then
CPPFLAGS="$CPPFLAGS -Werror -Wall -Wshadow -Wcast-align -Wno-uninitialized" CPPFLAGS="$CPPFLAGS -Werror -Wall -Wshadow -Wcast-align -Wno-uninitialized -Wempty-body -Wformat-security -Winit-self"
fi fi

4
tests/conform/test-binding-pool.c
View File

@ -260,9 +260,9 @@ on_activate (KeyGroup *key_group,
ClutterActor *child, ClutterActor *child,
gpointer data) gpointer data)
{ {
gint index = GPOINTER_TO_INT (data); gint _index = GPOINTER_TO_INT (data);
g_assert_cmpint (key_group->selected_index, ==, index); g_assert_cmpint (key_group->selected_index, ==, _index);
} }
void void