Ian Romanick 75398cff82 Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver ...

Conflicts:

	hw/xfree86/loader/Makefile.am
	hw/xfree86/loader/xf86sym.c

2006-06-20 15:49:47 -07:00

..

dlloader.c

Another round of loader sense-beating. Remove the (unused) server export

2006-06-19 00:57:18 -04:00

dlloader.h

Another round of loader sense-beating. Remove the (unused) server export

2006-06-19 00:57:18 -04:00

loader.c

Another round of loader sense-beating. Remove the (unused) server export

2006-06-19 00:57:18 -04:00

loader.h

Another round of loader sense-beating. Remove the (unused) server export

2006-06-19 00:57:18 -04:00

loaderProcs.h

Another round of loader sense-beating. Remove the (unused) server export

2006-06-19 00:57:18 -04:00

loadext.c

Another round of loader sense-beating. Remove the (unused) server export

2006-06-19 00:57:18 -04:00

loadfont.c

Another round of loader sense-beating. Remove the (unused) server export

2006-06-19 00:57:18 -04:00

loadmod.c

Another round of loader sense-beating. Remove the (unused) server export

2006-06-19 00:57:18 -04:00

Makefile.am

Another round of loader sense-beating. Remove the (unused) server export

2006-06-19 00:57:18 -04:00

os.c

Another round of loader sense-beating. Remove the (unused) server export

2006-06-19 00:57:18 -04:00

SparcMulDiv.S

Merging XORG-CURRENT into trunk

2004-04-23 19:54:30 +00:00

sym.h

Add Xtrans definitions (FONT_t, TRANS_CLIENT) to clean up warnings.

2005-07-03 07:02:09 +00:00

xf86sym.c

Another round of loader sense-beating. Remove the (unused) server export

2006-06-19 00:57:18 -04:00