Merge branch 'master' into next

This commit is contained in:
Michael Stapelberg 2011-11-22 22:08:43 +00:00
commit f7f1ec5dab
1 changed files with 1 additions and 1 deletions

View File

@ -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