Merge branch 'master' into cvm

This commit is contained in:
graham
2009-05-18 11:59:50 +01:00
392 changed files with 3608 additions and 1779 deletions

View File

@ -1,3 +1,3 @@
XFLAGS =
XINC = $(XFLAGS) -I/usr/X11R6/include
XLIBS = -L/usr/X11R6/lib64 -lXext -lX11
XINC = $(XFLAGS) -I/usr/include/X11
XLIBS = -L/usr/lib64 -lXext -lX11