Module Name: xsrc
Committed By: mrg
Date: Sat Nov 20 23:22:39 UTC 2010
Modified Files:
xsrc/external/mit/xrdb/dist: xrdb.c
Removed Files:
xsrc/external/mit/xgamma/dist: AUTHORS NEWS
xsrc/external/mit/xgc/dist: AUTHORS NEWS
xsrc/external/mit/xhost/dist: NEWS
xsrc/external/mit/xload/dist: AUTHORS NEWS XLoad.ad compile
xsrc/external/mit/xmag/dist: AUTHORS NEWS
xsrc/external/mit/xman/dist: AUTHORS NEWS version.h
xsrc/external/mit/xmh/dist: AUTHORS NEWS Xmh.ad black6 box6 compile
mkinstalldirs version.h
xsrc/external/mit/xmodmap/dist: NEWS xmodmap.man
xsrc/external/mit/xprop/dist: AUTHORS NEWS
xsrc/external/mit/xrdb/dist: NEWS
xsrc/external/mit/xrefresh/dist: AUTHORS NEWS
xsrc/external/mit/xsetroot/dist: AUTHORS NEWS
xsrc/external/mit/xwd/dist: AUTHORS NEWS
xsrc/external/mit/xwininfo/dist: AUTHORS NEWS
xsrc/external/mit/xwud/dist: AUTHORS NEWS
Log Message:
merge cornflakes
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/xgamma/dist/AUTHORS \
xsrc/external/mit/xgamma/dist/NEWS
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/xgc/dist/AUTHORS \
xsrc/external/mit/xgc/dist/NEWS
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/xhost/dist/NEWS
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/xload/dist/AUTHORS \
xsrc/external/mit/xload/dist/NEWS xsrc/external/mit/xload/dist/XLoad.ad \
xsrc/external/mit/xload/dist/compile
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/xmag/dist/AUTHORS \
xsrc/external/mit/xmag/dist/NEWS
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/xman/dist/AUTHORS \
xsrc/external/mit/xman/dist/NEWS xsrc/external/mit/xman/dist/version.h
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/xmh/dist/AUTHORS \
xsrc/external/mit/xmh/dist/NEWS xsrc/external/mit/xmh/dist/Xmh.ad \
xsrc/external/mit/xmh/dist/black6 xsrc/external/mit/xmh/dist/box6 \
xsrc/external/mit/xmh/dist/compile \
xsrc/external/mit/xmh/dist/mkinstalldirs \
xsrc/external/mit/xmh/dist/version.h
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/xmodmap/dist/NEWS
cvs rdiff -u -r1.1.1.2 -r0 xsrc/external/mit/xmodmap/dist/xmodmap.man
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/xprop/dist/AUTHORS \
xsrc/external/mit/xprop/dist/NEWS
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/xrdb/dist/NEWS
cvs rdiff -u -r1.2 -r1.3 xsrc/external/mit/xrdb/dist/xrdb.c
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/xrefresh/dist/AUTHORS \
xsrc/external/mit/xrefresh/dist/NEWS
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/xsetroot/dist/AUTHORS \
xsrc/external/mit/xsetroot/dist/NEWS
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/xwd/dist/AUTHORS \
xsrc/external/mit/xwd/dist/NEWS
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/xwininfo/dist/AUTHORS \
xsrc/external/mit/xwininfo/dist/NEWS
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/xwud/dist/AUTHORS \
xsrc/external/mit/xwud/dist/NEWS
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xrdb/dist/xrdb.c
diff -u xsrc/external/mit/xrdb/dist/xrdb.c:1.2 xsrc/external/mit/xrdb/dist/xrdb.c:1.3
--- xsrc/external/mit/xrdb/dist/xrdb.c:1.2 Sat Dec 5 03:29:11 2009
+++ xsrc/external/mit/xrdb/dist/xrdb.c Sat Nov 20 23:22:38 2010
@@ -1,8 +1,6 @@
/*
* xrdb - X resource manager database utility
*
- * $Xorg: xrdb.c,v 1.6 2000/08/17 19:54:56 cpqbld Exp $
- * $XdotOrg: app/xrdb/xrdb.c,v 1.5 2006/04/03 18:23:14 alanc Exp $
*/
/*
@@ -31,7 +29,6 @@
* used in advertising or publicity pertaining to distribution of the software
* without specific, written prior permission.
*/
-/* $XFree86: xc/programs/xrdb/xrdb.c,v 3.16tsi Exp $ */
/*
* this program is used to load, or dump the resource manager database
