Merging XORG-CURRENT into trunk

This commit is contained in:
Egbert Eich
2004-04-23 18:54:16 +00:00
parent 9d24a5fa91
commit 0664db19bf
265 changed files with 1251 additions and 313 deletions

View File

@@ -24,7 +24,7 @@ OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH
THE USE OR PERFORMANCE OF THIS SOFTWARE.
********************************************************/
/* $XFree86: xc/lib/X11/XKBMisc.c,v 3.6 2003/11/17 22:20:09 dawes Exp $ */
/* $XFree86: xc/lib/X11/XKBMisc.c,v 3.5 2001/10/28 03:32:33 tsi Exp $ */
#ifndef XKB_IN_SERVER