Commit Graph

6 Commits

Author SHA1 Message Date
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
4643566b25 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7267 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2011-12-01 17:37:10 +00:00
8c372f6c41 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7266 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2011-12-01 17:21:19 +00:00
c11cd8e8d2 make -suffix omp imply using package omp with default settings 2011-10-15 22:31:16 -04:00
209f169cbc git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@254 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2007-01-30 00:22:05 +00:00
222c95507e git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@26 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2006-09-27 19:51:33 +00:00