Merge branch 'master' into next

2011-11-22 22:08:43 +00:00 · 2011-11-22 22:08:43 +00:00 · f7f1ec5dab
parent acf29dbfd5 e09bb51c14
commit f7f1ec5dab
1 changed files with 1 additions and 1 deletions
--- a/include/xcursor.h
+++ b/include/xcursor.h
@ -35,6 +35,6 @@ int xcursor_get_xcb_cursor(enum xcursor_cursor_t c);
 * races might occur (even though we flush the Xlib connection).
 *
 */
-void xcursor_set_root_cursor();
+void xcursor_set_root_cursor(int cursor_id);

 #endif