Revision: Last Changed Rev: 79731
M       bin/scp-proc-to-proc
A  +  C christer
      >   local dir edit, incoming dir delete or move upon update
M  +    christer/isoth_expwave/idl/pd2.pro
M  +    christer/isoth_expwave/idl/pd2_import_CKD.py
M       idl/read/pc_read_video.pro
M       idl/visualization/rvid_box.pro
!       python
!       python/pencil
!       python/pencil/sim
M       python/tutorials/Python-IDL_dictionary/README
M       samples/GravitationalWaves/start.in
M       samples/conv-slab/src/Makefile.local
M       src/Makefile
M       src/cparam.f90
M       src/density.f90
M       src/eos_idealgas.f90
M       src/equ.f90
M       src/forcing.f90
M       src/hydro.f90
M       src/magnetic.f90
M       src/noentropy.f90
M       src/run.f90
M       src/special/chiral_mhd.f90
Summary of conflicts:
  Tree conflicts: 1