[Xorg-commit] CVS Update: xc (branch: XORG-RELEASE-1)
Egbert Eich
xorg-commit at pdx.freedesktop.org
Fri Mar 5 14:46:32 EET 2004
CVSROOT: /cvs/xorg
Module name: xc
Changes by: eich at pdx. 04/03/05 04:46:32
Log message:
- removing ': ' from lines which broke the build. These were added by a broken
script that automatically removed spurious conflitcs do to CVS tag
mismatches. The 'XdotOrg' tag really haunts me!
Modified files:
xc/doc/man/GL/gl/: Tag: XORG-RELEASE-1
texenv.3gl
xc/doc/man/misc/: Tag: XORG-RELEASE-1
Imakefile
xc/extras/ogl-sample/main/doc/man/mangl/standard/: Tag: XORG-RELEASE-1
texenv.gl
xc/extras/x86emu/src/x86emu/: Tag: XORG-RELEASE-1
decode.c
xc/fonts/encodings/: Tag: XORG-RELEASE-1
Imakefile iso8859-6.16.enc iso8859-6.8x.enc
xc/fonts/encodings/large/: Tag: XORG-RELEASE-1
Imakefile
xc/include/extensions/: Tag: XORG-RELEASE-1
XRes.h XvMClib.h
xc/lib/GL/dri/drm/: Tag: XORG-RELEASE-1
Imakefile
xc/lib/GL/mesa/src/OSmesa/: Tag: XORG-RELEASE-1
Imakefile
xc/lib/GL/mesa/src/drv/i810/: Tag: XORG-RELEASE-1
i810context.c
xc/lib/GL/mesa/src/drv/i830/: Tag: XORG-RELEASE-1
i830_context.c
xc/lib/GL/mesa/src/drv/mga/: Tag: XORG-RELEASE-1
mga_xmesa.c
xc/lib/GL/mesa/src/drv/r128/: Tag: XORG-RELEASE-1
r128_context.c
xc/lib/GL/mesa/src/drv/r200/: Tag: XORG-RELEASE-1
r200_screen.c
xc/lib/GL/mesa/src/drv/radeon/: Tag: XORG-RELEASE-1
radeon_screen.c
xc/lib/GL/mesa/src/drv/sis/: Tag: XORG-RELEASE-1
sis_alloc.h sis_clear.c sis_common2.h sis_context.c
sis_context.h sis_dd.c sis_dd.h sis_debug.c sis_debug.h
sis_fog.c sis_lock.c sis_lock.h sis_reg.h sis_screen.c
sis_screen.h sis_span.c sis_span.h sis_state.c
sis_state.h sis_stencil.c sis_stencil.h sis_tex.c
sis_tex.h sis_texstate.c sis_tris.c sis_tris.h
sis_tritmp.h sis_vb.c sis_vb.h
xc/lib/XRes/: Tag: XORG-RELEASE-1
XRes.man
xc/lib/Xcursor/: Tag: XORG-RELEASE-1
Xcursor.man
xc/lib/Xxf86dga/: Tag: XORG-RELEASE-1
Imakefile
xc/lib/fontconfig/: Tag: XORG-RELEASE-1
Imakefile
xc/lib/freetype2/: Tag: XORG-RELEASE-1
Imakefile
xc/nls/XLC_LOCALE/: Tag: XORG-RELEASE-1
zh_CN.UTF-8
xc/programs/fonttosfnt/: Tag: XORG-RELEASE-1
Imakefile
xc/programs/xdm/config/: Tag: XORG-RELEASE-1
XFree86.xpm XFree86bw.xpm
xc/programs/xedit/lisp/modules/: Tag: XORG-RELEASE-1
Imakefile xedit.lsp
xc/programs/xkbcomp/symbols/: Tag: XORG-RELEASE-1
altwin srvr_ctrl us_intl
xc/programs/xkbcomp/symbols/pc/: Tag: XORG-RELEASE-1
br ge_la us
xc/programs/xterm/: Tag: XORG-RELEASE-1
uxterm
Revision Changes Path
1.1.10.1 +5 -5 xc/doc/man/GL/gl/texenv.3gl
1.1.4.1.4.2 +1 -1 xc/doc/man/misc/Imakefile
1.1.10.1 +5 -5 xc/extras/ogl-sample/main/doc/man/mangl/standard/texenv.gl
1.1.4.1.4.2 +1 -1 xc/extras/x86emu/src/x86emu/decode.c
1.1.4.2.4.2 +1 -1 xc/fonts/encodings/Imakefile
1.1.4.1.4.2 +1 -1 xc/fonts/encodings/iso8859-6.16.enc
1.1.4.1.4.2 +1 -1 xc/fonts/encodings/iso8859-6.8x.enc
1.1.4.2.4.2 +1 -1 xc/fonts/encodings/large/Imakefile
1.1.4.1.4.2 +1 -1 xc/include/extensions/XRes.h
1.1.4.1.4.2 +1 -1 xc/include/extensions/XvMClib.h
1.1.4.2.4.2 +1 -1 xc/lib/GL/dri/drm/Imakefile
1.1.4.2.4.2 +1 -1 xc/lib/GL/mesa/src/OSmesa/Imakefile
1.1.4.2.4.2 +1 -1 xc/lib/GL/mesa/src/drv/i810/i810context.c
1.1.4.2.4.2 +1 -1 xc/lib/GL/mesa/src/drv/i830/i830_context.c
1.1.4.3.4.2 +1 -1 xc/lib/GL/mesa/src/drv/mga/mga_xmesa.c
1.1.4.2.4.2 +1 -1 xc/lib/GL/mesa/src/drv/r128/r128_context.c
1.1.4.3.4.2 +1 -1 xc/lib/GL/mesa/src/drv/r200/r200_screen.c
1.1.4.3.4.2 +1 -1 xc/lib/GL/mesa/src/drv/radeon/radeon_screen.c
1.1.4.1.4.2 +1 -1 xc/lib/GL/mesa/src/drv/sis/sis_alloc.h
1.1.4.2.4.2 +1 -1 xc/lib/GL/mesa/src/drv/sis/sis_clear.c
1.1.4.1.4.2 +1 -1 xc/lib/GL/mesa/src/drv/sis/sis_common2.h
1.1.4.1.4.2 +1 -1 xc/lib/GL/mesa/src/drv/sis/sis_context.c
1.1.4.1.4.2 +1 -1 xc/lib/GL/mesa/src/drv/sis/sis_context.h
1.1.4.1.4.2 +1 -1 xc/lib/GL/mesa/src/drv/sis/sis_dd.c
1.1.4.1.4.2 +1 -1 xc/lib/GL/mesa/src/drv/sis/sis_dd.h
1.1.4.2.4.2 +1 -1 xc/lib/GL/mesa/src/drv/sis/sis_debug.c
1.1.4.1.4.2 +1 -1 xc/lib/GL/mesa/src/drv/sis/sis_debug.h
1.1.4.2.4.2 +1 -1 xc/lib/GL/mesa/src/drv/sis/sis_fog.c
1.1.4.1.4.2 +1 -1 xc/lib/GL/mesa/src/drv/sis/sis_lock.c
1.1.4.2.4.2 +1 -1 xc/lib/GL/mesa/src/drv/sis/sis_lock.h
1.1.4.2.4.2 +1 -1 xc/lib/GL/mesa/src/drv/sis/sis_reg.h
1.1.4.1.4.2 +1 -1 xc/lib/GL/mesa/src/drv/sis/sis_screen.c
1.1.4.1.4.2 +1 -1 xc/lib/GL/mesa/src/drv/sis/sis_screen.h
1.1.4.2.4.2 +1 -1 xc/lib/GL/mesa/src/drv/sis/sis_span.c
1.1.4.1.4.2 +1 -1 xc/lib/GL/mesa/src/drv/sis/sis_span.h
1.1.4.1.4.2 +1 -1 xc/lib/GL/mesa/src/drv/sis/sis_state.c
1.1.4.1.4.2 +1 -1 xc/lib/GL/mesa/src/drv/sis/sis_state.h
1.1.4.2.4.2 +1 -1 xc/lib/GL/mesa/src/drv/sis/sis_stencil.c
1.1.4.1.4.2 +1 -1 xc/lib/GL/mesa/src/drv/sis/sis_stencil.h
1.1.4.1.4.2 +1 -1 xc/lib/GL/mesa/src/drv/sis/sis_tex.c
1.1.4.1.4.2 +1 -1 xc/lib/GL/mesa/src/drv/sis/sis_tex.h
1.1.4.1.4.2 +1 -1 xc/lib/GL/mesa/src/drv/sis/sis_texstate.c
1.1.4.1.4.2 +1 -1 xc/lib/GL/mesa/src/drv/sis/sis_tris.c
1.1.4.1.4.2 +1 -1 xc/lib/GL/mesa/src/drv/sis/sis_tris.h
1.1.4.1.4.2 +1 -1 xc/lib/GL/mesa/src/drv/sis/sis_tritmp.h
1.1.4.1.4.2 +1 -1 xc/lib/GL/mesa/src/drv/sis/sis_vb.c
1.1.4.1.4.2 +1 -1 xc/lib/GL/mesa/src/drv/sis/sis_vb.h
1.1.4.1.4.2 +1 -1 xc/lib/XRes/XRes.man
1.1.4.2.4.2 +1 -1 xc/lib/Xcursor/Xcursor.man
1.1.4.2.4.2 +1 -1 xc/lib/Xxf86dga/Imakefile
1.1.4.2.4.2 +1 -1 xc/lib/fontconfig/Imakefile
1.1.4.2.4.2 +1 -1 xc/lib/freetype2/Imakefile
1.1.4.1.4.2 +1 -1 xc/nls/XLC_LOCALE/zh_CN.UTF-8
1.1.4.3.4.2 +1 -1 xc/programs/fonttosfnt/Imakefile
1.1.4.1.4.2 +1 -1 xc/programs/xdm/config/XFree86.xpm
1.1.4.1.4.2 +1 -1 xc/programs/xdm/config/XFree86bw.xpm
1.1.4.2.4.2 +1 -1 xc/programs/xedit/lisp/modules/Imakefile
1.1.4.1.4.2 +1 -1 xc/programs/xedit/lisp/modules/xedit.lsp
1.1.4.1.4.2 +1 -1 xc/programs/xkbcomp/symbols/altwin
1.1.4.2.4.2 +1 -1 xc/programs/xkbcomp/symbols/srvr_ctrl
1.1.4.2.4.2 +1 -1 xc/programs/xkbcomp/symbols/us_intl
1.1.4.2.4.2 +1 -1 xc/programs/xkbcomp/symbols/pc/br
1.1.4.1.4.2 +1 -1 xc/programs/xkbcomp/symbols/pc/ge_la
1.1.4.2.4.2 +1 -1 xc/programs/xkbcomp/symbols/pc/us
1.1.4.2.4.2 +1 -1 xc/programs/xterm/uxterm
More information about the xorg-commit
mailing list