Merge branch 'master' into lammps-icms
0c24ab0b5300
Actions

Authored by Axel Kohlmeyer <akohlmey@gmail.com> on May 31 2012, 19:39.

Description

Merge branch 'master' into lammps-icms

Committed

Axel Kohlmeyer <akohlmey@gmail.com>

May 31 2012, 19:39

Pushed

junge

Oct 6 2016, 16:49

Parents

Branches

Unknown

Tags

Unknown

Axel Kohlmeyer <akohlmey@gmail.com> committed rLAMMPS0c24ab0b5300: Merge branch 'master' into lammps-icms (authored by Axel Kohlmeyer <akohlmey@gmail.com>).May 31 2012, 19:39

Commit	Author	Details	Committed
ab6e6d4ef1ad	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8197 f3b2605a-c512-4ea7…	May 30 2012
5d8ad6391485	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8196 f3b2605a-c512-4ea7…	May 30 2012
a0f5ea214a22	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8195 f3b2605a-c512-4ea7…	May 30 2012
59fa5d6cd17f	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8194 f3b2605a-c512-4ea7…	May 30 2012
022c83b95fe2	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8192 f3b2605a-c512-4ea7…	May 29 2012
824e0d321c17	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8191 f3b2605a-c512-4ea7…	May 29 2012
b2d26cc0647e	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8190 f3b2605a-c512-4ea7…	May 29 2012
6260b9cde4a6	sjplimp	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8189 f3b2605a-c512-4ea7…	May 29 2012

				Path
	M			doc/improper_cossq.html
	M			doc/improper_ring.html
	M			src/COLLOID/pair_colloid.h
	M			src/KSPACE/pair_lj_charmm_coul_long.cpp
	M			src/MOLECULE/pair_lj_charmm_coul_charmm.cpp
	M			src/STUBS/mpi.c
	M			src/USER-EWALDN/ewald_n.cpp
	M			src/USER-MISC/dihedral_table.cpp
	M			src/error.cpp
	M			src/lattice.h
	M			src/pair.cpp
	M			src/pair.h
	M			src/pair_lj96_cut.cpp
	M			src/pair_table.cpp
	M			src/pair_table.h