Commit Graph

14 Commits

Author SHA1 Message Date
115df8a116 Merge remote branch 'lammps-ro/master' into lammps-icms
Resolved Conflicts:
	doc/Manual.txt
	src/KSPACE/pair_lj_long_coul_long.cpp
	src/KSPACE/pair_lj_long_coul_long.h
	src/pair.h
2013-03-05 13:25:28 +01:00
ceec8056fd fix up permissions 2013-03-05 09:53:36 +01:00
a746d1ce48 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9567 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-03-05 00:00:50 +00:00
a5c6bfb1c5 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9566 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-03-04 23:09:29 +00:00
8f94aa8010 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9479 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-02-14 15:36:49 +00:00
59b8846dc5 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@9442 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2013-02-11 15:30:18 +00:00
081640f422 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8986 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2012-10-19 21:28:57 +00:00
8c55ffbce0 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8965 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2012-10-15 15:14:07 +00:00
fe2278f1b7 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8952 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2012-10-12 19:45:06 +00:00
7103e5903b git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8934 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2012-10-10 15:17:28 +00:00
4fbc4692aa git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8907 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2012-10-05 14:41:25 +00:00
1adc4fee98 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8869 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2012-10-02 20:23:22 +00:00
9f8c6721d0 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8866 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2012-10-02 20:11:55 +00:00
4ee654c18e git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8856 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2012-10-02 16:54:57 +00:00