2 Commits

Author	SHA1	Message	Date
Axel Kohlmeyer	e240e15c4d	Merge remote-tracking branch 'lammps-ro/master' into lammps-icms ... Resolved Conflicts: doc/Manual.txt src/USER-MISC/dihedral_nharmonic.cpp src/USER-MISC/pair_lj_sf_dipole_sf.h	2013-06-09 14:35:36 +02:00
sjplimp	5f25e2a828	git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@10050 f3b2605a-c512-4ea7-a41b-209d697bcdaa	2013-06-08 21:29:04 +00:00