Hey Dave:
- oscar/dist/make-dist.sh
* the trunk one actually has a bug fix
which Jeff submitted
* status should be OK
-oscar/oscarsamples/mandrake-10.0-i386.rpmlist
* probably best to leave it as is as it
will probably be used as the basis for support for Mandrake 10.1+
I can probably copy all the missing files
for the Ganglia package from the branch back to the trunk, let me
know.
Cheers,
Bernard
From: [EMAIL PROTECTED] on behalf of David N. Lombard
Sent: Sun 02/01/2005 11:38 PM
To: OSCAR-devel
Subject: [Oscar-devel] trunk v. branch
All,
I've attached a text file with the results of my
diff of trunk v. branch
at r2836 on 1/1/05
Please take a look for
files you've modified, to make sure the proposed
actions are
correct.
Key:
COPY TO TRUNK: the beta branch is the right
one
OK: the
trunk is the right one.
IGNORE: a
file only in the beta branch will be
ignored
MERGE: merge the two
copies.
DELETE: a file to be
deleted from the trunk
ADD TO TRUNK: a file to be added to the
trunk
--
David N. Lombard
Rossmoor, Orange County, CA
http://www.fourmilab.ch/cgi-bin/uncgi/Earth?imgsize=320&opt=-z&lat=33.8&ns=North&lon=118.08&ew=West&alt=7&img=learth.evif
