|
|
9d162cd555
|
Merge branch 'master' into openmp-master
Resolved Conflicts:
doc/Section_commands.txt
doc/Section_packages.txt
doc/Section_start.txt
doc/angle_sdk.html
doc/package.txt
doc/pair_coul_diel.txt
doc/pair_gauss.txt
doc/pair_sdk.html
doc/suffix.txt
src/GPU/pppm_gpu.cpp
src/PERI/fix_peri_neigh.h
src/USER-CG-CMM/README
src/USER-OMP/fix_peri_neigh_omp.h
src/input.cpp
src/min.cpp
src/verlet.cpp
|
2011-12-02 11:52:06 -05:00 |
|