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

Resolved Conflicts:
	doc/Manual.txt
	doc/Section_start.txt
	src/citeme.cpp
	src/citeme.h
	src/lammps.cpp
	src/neighbor.cpp

2013-07-31 14:39:31 +02:00

..

atc

test if I can commit

2013-07-30 21:52:03 +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

improvements to serialization/deserialization feature

2013-05-24 15:14:38 +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

misc

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

2013-07-26 15:38:06 +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@6836 f3b2605a-c512-4ea7-a41b-209d697bcdaa

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