Revision: Last Changed Rev: 79883
!       .
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_1d_aver.pro
M       idl/read/pc_read_video.pro
M       idl/read/pc_varcontent.pro
M       idl/visualization/rvid_box.pro
!       python
!       python/pencil
!       python/pencil/sim
M       python/tutorials/Python-IDL_dictionary/README
M       samples/2d-tests/chiral_dynamo/print.in
M       samples/2d-tests/chiral_dynamo/run.in
M       samples/2d-tests/chiral_dynamo/src/cparam.local
M       samples/2d-tests/chiral_dynamo/start.in
M       samples/GravitationalWaves/README.md
M       samples/GravitationalWaves/run.in
M       samples/GravitationalWaves/src/Makefile.local
M       samples/GravitationalWaves/start.in
M       samples/GravitationalWaves/video.in
M       samples/conv-slab/run.in
M       samples/conv-slab/src/Makefile.local
M       samples/conv-slab/src/cparam.local
M       samples/helical-MHDturb/run.in
M       samples/helical-MHDturb/start.in
M       src/Makefile
M       src/Makefile-standard.inc
M       src/Makefile.inc
M       src/Makefile.src
M       src/README
M       src/cparam.f90
M       src/density.f90
M       src/eos_idealgas.f90
M       src/equ.f90
M       src/hydro.f90
M       src/magnetic.f90
M       src/special/chiral_mhd.f90
M       src/special/gravitational_waves_hTXk.f90
M       src/special.f90
M       utils/axel/copy-proc-to-proc
Summary of conflicts:
  Tree conflicts: 1