Merged changes from RELEASE-1 branch

2004-04-15 10:17:35 +00:00
parent 629c379222
commit c6c6d0de23
169 changed files with 15608 additions and 1507 deletions
--- a/include/cursor.h
+++ b/include/cursor.h
@@ -141,8 +141,8 @@ extern void GetSpritePosition(
    int * /*px*/,
    int * /*py*/);

-#ifdef XINERAMA
+#ifdef PANORAMIX
 extern int XineramaGetCursorScreen(void);
-#endif /* XINERAMA */
+#endif /* PANORAMIX */

 #endif /* CURSOR_H */