List of collisions/modifications in src (25 June 2005)

C Makefile.src
C boundcond.f90
C cdata.f90
C density.f90
C dustdensity.f90
C dustvelocity.f90
C entropy.f90
M equ.f90
M filter.f90
C general.f90
M grav_r.f90
M grav_x.f90
M grav_y.f90
M grav_z.f90
A grid_equidistant.f90
C hydro.f90
M hydro_ffreeMHDrel.f90
M initcond.f90
C interstellar.f90
M io_dist.f90
M io_mpio.f90
C magnetic.f90
M magnetic_ffreeMHDrel.f90
M mpicomm.f90
C nodensity.f90
C noentropy.f90
C nohydro.f90
C nohydro_file.f90
C nomagnetic.f90
M nompicomm.f90
A notestfield.f90
C param_io.f90
M power_spectrum.f90
M prints.f90
C pscalar.f90
C pscalar_nolog.f90
M radiation.f90
M radiation_ray_periodic.f90
M read_videofiles.f90
C register.f90
M run.f90
C start.f90
M sub.f90
C temperature.f90
A testfield.f90
M visc_smagorinsky.f90
M visc_var.f90

List of collisions/modifications in bin (25 June 2005)

M auto-test
C getconf.csh
C mkdatadir
M nl2idl
C pencil-test
C setup-src
M start.csh
M tsnap

List of collisions/modifications in samples (25 June 2005)

C dust-vortex/src/Makefile.local
M helical-MHDturb/run.in
M helical-MHDturb/src/Makefile.local
M helical-MHDturb/src/cparam.local
C interstellar/reference.out
C kin-dynamo/run.in

Remove (25 June 2005)

cvs -q up | grep -v "^C"
rm -f `cvs -q up | grep -v "^C"`

Listing of colliding files (25 June 2005)

brandenb@nl6:/home/brandenb/cvs-src/branches/merge_eos/src> cvs up
cvs server: Updating .
C Makefile.src
C boundcond.f90
C cdata.f90
C density.f90
C dustdensity.f90
C dustvelocity.f90
C entropy.f90
C general.f90
C hydro.f90
C interstellar.f90
C magnetic.f90
C nodensity.f90
C noentropy.f90
C nohydro.f90
C nohydro_file.f90
C nomagnetic.f90
C param_io.f90
C pscalar.f90
C pscalar_nolog.f90
C register.f90
C start.f90
C temperature.f90

$Date: 2005/06/27 05:20:12 $, $Author: brandenb $, $Revision: 1.1 $