Axel Kohlmeyer e1709a4489 Merge branch 'master' into lammps-icms ...

Resolved Conflicts:
	src/USER-OMP/msm_omp.cpp
	src/USER-OMP/msm_omp.h
	src/USER-OMP/pair_born_coul_msm_omp.cpp
	src/USER-OMP/pair_born_coul_msm_omp.h
	src/USER-OMP/pair_buck_coul_msm_omp.cpp
	src/USER-OMP/pair_buck_coul_msm_omp.h
	src/USER-OMP/pair_coul_msm_omp.cpp
	src/USER-OMP/pair_coul_msm_omp.h
	src/USER-OMP/pair_lj_charmm_coul_msm_omp.cpp
	src/USER-OMP/pair_lj_charmm_coul_msm_omp.h
	src/USER-OMP/pair_lj_cut_coul_msm_omp.cpp
	src/USER-OMP/pair_lj_cut_coul_msm_omp.h

2013-01-18 07:50:51 -05:00

..

atc

git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9278 f3b2605a-c512-4ea7-a41b-209d697bcdaa

2013-01-17 15:52:46 +00:00

awpmd/H

git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6379 f3b2605a-c512-4ea7-a41b-209d697bcdaa

2011-06-13 22:31:50 +00:00

cg-cmm

documentation updates

2012-01-07 12:01:15 -05:00

colvars

Merge branch 'master' into lammps-icms

2012-05-24 09:03:58 -04:00

cuda

git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6272 f3b2605a-c512-4ea7-a41b-209d697bcdaa

2011-06-01 00:01:29 +00:00

eff

git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9204 f3b2605a-c512-4ea7-a41b-209d697bcdaa

2013-01-03 16:22:36 +00:00

gauss

add input example for ewald/cg.

2010-05-26 12:31:09 -04:00

gauss-diel

git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@7256 f3b2605a-c512-4ea7-a41b-209d697bcdaa

2011-12-01 14:58:11 +00:00

imd

update and remove crud.

2012-01-05 14:41:52 -05:00

misc/meam_sw_spline

git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9027 f3b2605a-c512-4ea7-a41b-209d697bcdaa

2012-10-26 23:31:09 +00:00

openmp

update and remove crud.

2012-01-05 14:41:52 -05:00

sph

git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@6836 f3b2605a-c512-4ea7-a41b-209d697bcdaa

2011-08-27 20:08:16 +00:00