Commit Graph

5 Commits

Author SHA1 Message Date
d4ada34579 Merge branch 'master' into lammps-icms
merge in gpu pair style update from master.
needed to resolve lots of whitespace conflicts.
2010-11-24 12:31:02 -05:00
4366bfffd3 Getting rid of extra CR characters at ends of lines.
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5285 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2010-11-23 19:52:03 +00:00
5a82c99485 Changes from Mike Brown.
git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5277 f3b2605a-c512-4ea7-a41b-209d697bcdaa
2010-11-23 00:40:35 +00:00
233de1db5d add note saying this is a modified source. 2010-11-17 21:06:45 -05:00
ba5fb80d1d merge of GPU library from gpulammps project.
this copies over all required files, but tried to
remove unneeded components.
2010-11-07 17:49:43 -05:00