Merge branch 'master' into xi2

2009-04-19 22:28:22 +10:00
parent 54716fd3db 0e0642ee94
commit d5ad14c8ed
70 changed files with 1286 additions and 696 deletions
--- a/include/xkbsrv.h
+++ b/include/xkbsrv.h
@@ -857,6 +857,11 @@ extern _X_EXPORT void	XkbGetRulesDflts(
        XkbRMLVOSet *           /* rmlvo */
 );

+extern _X_EXPORT void   XkbFreeRMLVOSet(
+        XkbRMLVOSet *           /* rmlvo */,
+        Bool                    /* freeRMLVO */
+);
+
 extern _X_EXPORT void	XkbSetRulesDflts(
        XkbRMLVOSet *           /* rmlvo */
 );