|
|
ce2b853e4a
|
Merge remote branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
doc/Eqs/pair_gauss.jpg
doc/Manual.txt
doc/pair_list.html
doc/pair_list.txt
lib/atc/Makefile.lammps.linalg
lib/awpmd/Makefile.lammps.linalg
lib/gpu/Makefile.lincoln
lib/linalg/Makefile.gfortran
lib/linalg/Makefile.mingw_cross
lib/linalg/README
lib/reax/Makefile.lammps
src/USER-CG-CMM/Install.sh
src/USER-COLVARS/Install.sh
src/USER-CUDA/Install.sh
src/USER-MISC/Install.sh
src/USER-MISC/pair_list.cpp
src/USER-OMP/Install.sh
src/USER-PHONON/Install.sh
|
2013-06-01 13:53:34 +02:00 |
|
