Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src merge xtrans 1.3.3 (deletes Xtranstli.c -- so sad, bye bye.)



details:   https://anonhg.NetBSD.org/src/rev/60b2ebc01d0b
branches:  trunk
changeset: 327785:60b2ebc01d0b
user:      mrg <mrg%NetBSD.org@localhost>
date:      Mon Mar 17 01:09:07 2014 +0000

description:
merge xtrans 1.3.3 (deletes Xtranstli.c -- so sad, bye bye.)

diffstat:

 distrib/sets/lists/xcomp/mi               |  4 ++--
 external/mit/xorg/include/xtrans/Makefile |  4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diffs (35 lines):

diff -r e0d0c8399a8c -r 60b2ebc01d0b distrib/sets/lists/xcomp/mi
--- a/distrib/sets/lists/xcomp/mi       Mon Mar 17 01:03:51 2014 +0000
+++ b/distrib/sets/lists/xcomp/mi       Mon Mar 17 01:09:07 2014 +0000
@@ -1,4 +1,4 @@
-#       $NetBSD: mi,v 1.145 2014/03/16 23:25:15 mrg Exp $
+#       $NetBSD: mi,v 1.146 2014/03/17 01:09:07 mrg Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -5334,7 +5334,7 @@
 ./usr/X11R7/include/X11/Xtrans/Xtranslcl.c             -unknown-       xorg
 ./usr/X11R7/include/X11/Xtrans/Xtransos2.c             -unknown-       xorg
 ./usr/X11R7/include/X11/Xtrans/Xtranssock.c            -unknown-       xorg
-./usr/X11R7/include/X11/Xtrans/Xtranstli.c             -unknown-       xorg
+./usr/X11R7/include/X11/Xtrans/Xtranstli.c             -obsolete-      obsolete
 ./usr/X11R7/include/X11/Xtrans/Xtransutil.c            -unknown-       xorg
 ./usr/X11R7/include/X11/Xtrans/transport.c             -unknown-       xorg
 ./usr/X11R7/include/X11/Xutil.h                                -unknown-       xorg
diff -r e0d0c8399a8c -r 60b2ebc01d0b external/mit/xorg/include/xtrans/Makefile
--- a/external/mit/xorg/include/xtrans/Makefile Mon Mar 17 01:03:51 2014 +0000
+++ b/external/mit/xorg/include/xtrans/Makefile Mon Mar 17 01:09:07 2014 +0000
@@ -1,11 +1,11 @@
-#      $NetBSD: Makefile,v 1.2 2008/09/13 04:32:29 cube Exp $
+#      $NetBSD: Makefile,v 1.3 2014/03/17 01:09:07 mrg Exp $
 
 .include <bsd.own.mk>
 
 .PATH: ${X11SRCDIR.xtrans}
 
 INCS=  Xtrans.c Xtrans.h Xtransdnet.c Xtransint.h Xtranslcl.c \
-       Xtransos2.c Xtranssock.c Xtranstli.c Xtransutil.c transport.c
+       Xtransos2.c Xtranssock.c Xtransutil.c transport.c
 INCSDIR=${X11INCDIR}/X11/Xtrans
 
 NOOBJ= # defined



Home | Main Index | Thread Index | Old Index