Axel Kohlmeyer fb3a956155 Merge remote branch 'lammps-ro/master' into lammps-icms ...

Resolved Conflicts:
	src/atom.cpp

2014-04-08 12:56:10 +02:00

..

atc

in development : not for release

2014-03-24 21:00: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

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

2014-04-07 19:50:55 +00:00

colvars

Merge remote branch 'lammps-ro/master' into lammps-icms

2014-04-08 12:56:10 +02: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

lb

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

2013-11-07 20:07:43 +00:00

misc

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

2013-11-04 20:54:41 +00:00

openmp

update and remove crud.

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

phonon

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

2013-03-11 20:47:14 +00:00

sph

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

2013-10-02 13:29:44 +00:00